rpms/poco/devel poco-1.3.6p1-syslibs.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 poco.spec, 1.1, 1.2 sources, 1.2, 1.3 poco-1.3.5-syslibs.patch, 1.1, NONE
udushlivy
udushlivy at fedoraproject.org
Wed Dec 23 15:11:58 UTC 2009
Author: udushlivy
Update of /cvs/pkgs/rpms/poco/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv310/devel
Modified Files:
.cvsignore import.log poco.spec sources
Added Files:
poco-1.3.6p1-syslibs.patch
Removed Files:
poco-1.3.5-syslibs.patch
Log Message:
cvs-import, devel, 1.3.6p1-1
poco-1.3.6p1-syslibs.patch:
Foundation/Makefile | 1 -
Foundation/src/Unicode.cpp | 41 ++++++++++++++++-------------------------
Zip/src/ZipStream.cpp | 2 +-
3 files changed, 17 insertions(+), 27 deletions(-)
--- NEW FILE poco-1.3.6p1-syslibs.patch ---
diff -up poco-1.3.6p1-all/Foundation/Makefile.orig poco-1.3.6p1-all/Foundation/Makefile
--- poco-1.3.6p1-all/Foundation/Makefile.orig 2009-12-21 21:14:59.000000000 +0300
+++ poco-1.3.6p1-all/Foundation/Makefile 2009-12-23 14:35:20.457635607 +0300
@@ -43,7 +43,6 @@ pcre_objects = pcre_chartables pcre_comp
pcre_utf8_objects = pcre_ucd pcre_tables
ifdef POCO_UNBUNDLED
- objects += $(pcre_utf8_objects)
SYSLIBS += -lpcre -lz
else
objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects)
diff -up poco-1.3.6p1-all/Foundation/src/Unicode.cpp.orig poco-1.3.6p1-all/Foundation/src/Unicode.cpp
--- poco-1.3.6p1-all/Foundation/src/Unicode.cpp.orig 2009-12-21 21:14:59.000000000 +0300
+++ poco-1.3.6p1-all/Foundation/src/Unicode.cpp 2009-12-23 14:27:26.168636009 +0300
@@ -37,56 +37,47 @@
#include "Poco/Unicode.h"
-extern "C"
-{
-#include "pcre_config.h"
-#include "pcre_internal.h"
-}
+#include <wctype.h>
+#include <locale.h>
namespace Poco {
-void Unicode::properties(int ch, CharacterProperties& props)
-{
- const ucd_record* ucd = GET_UCD(ch);
- props.category = static_cast<CharacterCategory>(_pcre_ucp_gentype[ucd->chartype]);
- props.type = static_cast<CharacterType>(ucd->chartype);
- props.script = static_cast<Script>(ucd->script);
+//void Unicode::properties(int ch, CharacterProperties& props)
+//{
+//}
+
+
+locale_t get_ctype_locale() {
+ static locale_t locale= NULL;
+ if(!locale)
+ locale= newlocale(LC_CTYPE_MASK, "en_US.UTF-8", NULL);
+ return locale;
}
bool Unicode::isLower(int ch)
{
- CharacterProperties props;
- properties(ch, props);
- return props.category == UCP_LETTER && props.type == UCP_LOWER_CASE_LETTER;
+ return iswlower_l(ch, get_ctype_locale());
}
bool Unicode::isUpper(int ch)
{
- CharacterProperties props;
- properties(ch, props);
- return props.category == UCP_LETTER && props.type == UCP_UPPER_CASE_LETTER;
+ return iswupper_l(ch, get_ctype_locale());
}
int Unicode::toLower(int ch)
{
- if (isUpper(ch))
- return static_cast<int>(UCD_OTHERCASE(static_cast<unsigned>(ch)));
- else
- return ch;
+ return towlower_l(ch, get_ctype_locale());
}
int Unicode::toUpper(int ch)
{
- if (isLower(ch))
- return static_cast<int>(UCD_OTHERCASE(static_cast<unsigned>(ch)));
- else
- return ch;
+ return towupper_l(ch, get_ctype_locale());
}
diff -up poco-1.3.6p1-all/Zip/src/ZipStream.cpp.orig poco-1.3.6p1-all/Zip/src/ZipStream.cpp
--- poco-1.3.6p1-all/Zip/src/ZipStream.cpp.orig 2009-12-21 21:15:03.000000000 +0300
+++ poco-1.3.6p1-all/Zip/src/ZipStream.cpp 2009-12-23 14:54:03.101635883 +0300
@@ -35,7 +35,7 @@
#include "Poco/Zip/ZipStream.h"
-#include "Poco/zlib.h"
+#include <zlib.h>
#include "Poco/Zip/ZipArchive.h"
#include "Poco/Zip/AutoDetectStream.h"
#include "Poco/Zip/PartialStream.h"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poco/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 27 Nov 2009 13:38:10 -0000 1.2
+++ .cvsignore 23 Dec 2009 15:11:56 -0000 1.3
@@ -1,2 +1,2 @@
-poco-1.3.5-all.tar.bz2
-poco-1.3.5-doc.tar.gz
+poco-1.3.6-all-doc.tar.gz
+poco-1.3.6p1-all.tar.bz2
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/poco/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 27 Nov 2009 13:38:10 -0000 1.1
+++ import.log 23 Dec 2009 15:11:57 -0000 1.2
@@ -1 +1,2 @@
poco-1_3_5-8_fc12:HEAD:poco-1.3.5-8.fc12.src.rpm:1259328377
+poco-1_3_6p1-1_fc12:HEAD:poco-1.3.6p1-1.fc12.src.rpm:1261581073
Index: poco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poco/devel/poco.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- poco.spec 27 Nov 2009 13:38:10 -0000 1.1
+++ poco.spec 23 Dec 2009 15:11:57 -0000 1.2
@@ -1,7 +1,11 @@
+%define poco_src_version 1.3.6p1
+%define poco_doc_version 1.3.6
+%define poco_rpm_release 1
+
Name: poco
-Version: 1.3.5
-Release: 8%{?dist}
+Version: %{poco_src_version}
+Release: %{poco_rpm_release}%{?dist}
Summary: C++ class libraries for network-centric applications
Group: Development/Libraries
@@ -9,11 +13,11 @@ License: Boost
URL: http://pocoproject.org
Source0: http://downloads.sourceforge.net/poco/poco-%{version}-all.tar.bz2
-Source1: http://downloads.sourceforge.net/poco/poco-%{version}-doc.tar.gz
+Source1: http://downloads.sourceforge.net/poco/poco-%{poco_doc_version}-all-doc.tar.gz
# This patch updates makefiles and sources in order to exclude the
# bundled versions of the system libraries from the build process.
-Patch0: poco-1.3.5-syslibs.patch
+Patch0: poco-1.3.6p1-syslibs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,11 +38,11 @@ including the standard library.
%prep
%setup -q -n poco-%{version}-all -a1
-/bin/chmod -R a-x+X poco-%{version}-doc
+/bin/chmod -R a-x+X poco-%{poco_doc_version}-all-doc
/bin/sed -i.orig -e 's|$(INSTALLDIR)/lib\b|$(INSTALLDIR)/%{_lib}|g' Makefile
/bin/sed -i.orig -e 's|ODBCLIBDIR = /usr/lib\b|ODBCLIBDIR = %{_libdir}|g' Data/ODBC/Makefile Data/ODBC/testsuite/Makefile
/bin/sed -i.orig -e 's|flags=""|flags="%{optflags}"|g' configure
-rm -f Crypto/include/Poco/.*DS_Store
+/bin/sed -i.orig -e 's|SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)|SHAREDOPT_LINK =|g' build/config/Linux
rm -f Foundation/src/MSG00001.bin
%patch0 -p1 -b .orig
rm -f Foundation/include/Poco/zconf.h
@@ -87,7 +91,7 @@ rm -f XML/src/xmltok_impl.h
rm -f XML/src/xmltok_ns.c
%build
-%configure --include-path=%{_includedir}/libiodbc --library-path=%{_libdir}/mysql
+%configure --unbundled --include-path=%{_includedir}/libiodbc --library-path=%{_libdir}/mysql
make %{?_smp_mflags} STRIP=/bin/true
%install
@@ -273,6 +277,18 @@ class libraries for network-centric appl
%defattr(-, root, root, -)
%{_libdir}/libPocoZip.so.*
+%package pagecompiler
+Summary: The PageCompiler POCO component
+Group: System Environment/Libraries
+
+%description pagecompiler
+This package contains the PageCompiler component of POCO. (POCO is a
+set of C++ class libraries for network-centric applications.)
+
+%files pagecompiler
+%defattr(-, root, root, -)
+%{_bindir}/cpspc
+
%package debug
Summary: Debug builds of the POCO libraries
Group: Development/Libraries
@@ -298,6 +314,7 @@ application testing purposes.
%{_libdir}/libPocoODBCd.so.*
%{_libdir}/libPocoMySQLd.so.*
%{_libdir}/libPocoZipd.so.*
+%{_bindir}/cpspcd
%package devel
Summary: Headers for developing programs that will use POCO
@@ -315,6 +332,7 @@ Requires: poco-sqlite = %{versio
Requires: poco-odbc = %{version}-%{release}
Requires: poco-mysql = %{version}-%{release}
Requires: poco-zip = %{version}-%{release}
+Requires: poco-pagecompiler = %{version}-%{release}
%description devel
The POCO C++ Libraries (POCO stands for POrtable COmponents)
@@ -369,9 +387,17 @@ HTML format.
%files doc
%defattr(-, root, root, -)
-%doc poco-%{version}-doc/*
+%doc poco-%{poco_doc_version}-all-doc/*
%changelog
+* Wed Dec 23 2009 Maxim Udushlivy <udushlivy at mail.ru> - 1.3.6p1-1
+- The package was upgraded for the use of POCO version 1.3.6p1.
+- A new binary package (poco-pagecompiler) is now produced by the
+rpmbuild process.
+- The syslibs patch was considerably simplified (based on a new
+"configure" script option which was introduced by POCO developers for
+the maintainers of the POCO Debian package).
+
* Tue Nov 17 2009 Maxim Udushlivy <udushlivy at mail.ru> - 1.3.5-8
- The "make" invocation command in the %%build section was modified to
skip premature symbol stripping from retail libraries.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poco/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 27 Nov 2009 13:38:10 -0000 1.2
+++ sources 23 Dec 2009 15:11:57 -0000 1.3
@@ -1,2 +1,2 @@
-b36fc66e39560dd985d4ae4bc8011be8 poco-1.3.5-all.tar.bz2
-357fbbb4f31921ebe7dc49a1b6b5742c poco-1.3.5-doc.tar.gz
+a6abb9a02b0a7406194853d422d5fc28 poco-1.3.6-all-doc.tar.gz
+a03e5eb51b8ac3f57161645230750262 poco-1.3.6p1-all.tar.bz2
--- poco-1.3.5-syslibs.patch DELETED ---
More information about the fedora-extras-commits
mailing list