rpms/poco/devel import.log,1.3,1.4 poco.spec,1.3,1.4

[udushlivy]

Author: udushlivy

Update of /cvs/pkgs/rpms/poco/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10631/devel

Modified Files:
	import.log poco.spec 
Log Message:
cvs-import, devel, 1.3.6p2-2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/poco/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	7 May 2010 16:26:34 -0000	1.3
+++ import.log	2 Jun 2010 15:54:17 -0000	1.4
@@ -1,3 +1,4 @@
 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
 poco-1_3_6p2-1_fc12:HEAD:poco-1.3.6p2-1.fc12.src.rpm:1273249534
+poco-1_3_6p2-2_fc13:HEAD:poco-1.3.6p2-2.fc13.src.rpm:1275493941


Index: poco.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poco/devel/poco.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- poco.spec	7 May 2010 16:26:34 -0000	1.3
+++ poco.spec	2 Jun 2010 15:54:18 -0000	1.4
@@ -1,7 +1,10 @@
 
-%define poco_src_version 1.3.6p2
-%define poco_doc_version 1.3.6
-%define poco_rpm_release 1
+%global poco_src_version 1.3.6p2
+%global poco_doc_version 1.3.6
+%global poco_rpm_release 2
+
+%bcond_without tests
+%bcond_without samples
 
 Name:             poco
 Version:          %{poco_src_version}
@@ -43,6 +46,7 @@ including the standard library.
 /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
 /bin/sed -i.orig -e 's|SHAREDOPT_LINK  = -Wl,-rpath,$(LIBPATH)|SHAREDOPT_LINK  =|g' build/config/Linux
+/bin/sed -i.orig -e 's|#endif|#define POCO_UNBUNDLED 1\n\n#endif|g' Foundation/include/Poco/Config.h
 rm -f Foundation/src/MSG00001.bin
 %patch0 -p1 -b .orig
 rm -f Foundation/include/Poco/zconf.h
@@ -91,15 +95,26 @@ rm -f XML/src/xmltok_impl.h
 rm -f XML/src/xmltok_ns.c
 
 %build
-%configure --unbundled --include-path=%{_includedir}/libiodbc --library-path=%{_libdir}/mysql
+%if %{without tests}
+  %global poco_tests --no-tests
+%else
+  %global poco_tests --noop
+%endif
+%if %{without samples}
+  %global poco_samples --no-samples
+%else
+  %global poco_samples --noop
+%endif
+./configure --prefix=%{_prefix} --unbundled %poco_tests %poco_samples --include-path=%{_includedir}/libiodbc --library-path=%{_libdir}/mysql
 make %{?_smp_mflags} STRIP=/bin/true
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+rm -f %{buildroot}%{_prefix}/include/Poco/Config.h.orig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %package          foundation
 Summary:          The Foundation POCO component
@@ -334,6 +349,9 @@ Requires:         poco-mysql = %{version
 Requires:         poco-zip = %{version}-%{release}
 Requires:         poco-pagecompiler = %{version}-%{release}
 
+Requires:         zlib-devel
+Requires:         expat-devel
+
 %description devel
 The POCO C++ Libraries (POCO stands for POrtable COmponents) 
 are open source C++ class libraries that simplify and accelerate the 
@@ -390,6 +408,10 @@ HTML format.
 %doc poco-%{poco_doc_version}-all-doc/*
 
 %changelog
+* Wed Jun 02 2010 Maxim Udushlivy <udushlivy at mail.ru> - 1.3.6p2-2
+- Missing dependencies on system header files were fixed.
+- Options were added to build POCO without tests and samples.
+
 * Fri May 07 2010 Maxim Udushlivy <udushlivy at mail.ru> - 1.3.6p2-1
 - The package was upgraded for the use of POCO version 1.3.6p2.