[poco/el6: 12/12] Merge branch 'master' into el6

Thu Dec 8 17:32:38 UTC 2011

commit 1db997fe4ae5ed5c518e865b8d2f46821cbbabd7
Merge: 3eb02a8 382b442
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Thu Dec 8 16:43:24 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	poco.spec
    	sources

 .gitignore |   10 +++
 poco.spec  |  179 ++++++++++++++++++++++++++++++++++++++++++------------------
 sources    |    4 +-
 3 files changed, 137 insertions(+), 56 deletions(-)
---
diff --cc .gitignore
index 426774c,ed0847c..0e36efd

--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,10 +1,12 @@@
 +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.6p2-all.tar.bz2
+ /poco-1.4.0-all-doc.tar.gz
+ /poco-1.4.0-all.tar.bz2
+ /poco-1.4.1-all-doc.tar.gz
+ /poco-1.4.1-all.tar.bz2
+ /poco-1.4.1p1-all-doc.tar.gz
+ /poco-1.4.1p1-all.tar.bz2
+ /poco-1.4.2p1-all-doc.tar.gz
+ /poco-1.4.2p1-all.tar.bz2
diff --cc poco.spec
index 47ba898,c3fd4b9..147617d
--- a/poco.spec
+++ b/poco.spec
@@@ -1,7 -1,14 +1,13 @@@
 -
+ %global poco_src_version 1.4.2p1
+ %global poco_doc_version 1.4.2p1
+ %global poco_rpm_release 1
+ 
+ %bcond_without tests
+ %bcond_without samples
  
  Name:             poco
- Version:          1.3.5
- Release:          9%{?dist}
+ Version:          %{poco_src_version}
+ Release:          %{poco_rpm_release}%{?dist}
  Summary:          C++ class libraries for network-centric applications
  
  Group:            Development/Libraries
@@@ -371,21 -405,54 +404,58 @@@ HTML format
  
  %files doc
  %defattr(-, root, root, -)
- %doc poco-%{version}-doc/*
+ %doc poco-%{poco_doc_version}-all-doc/*
  
  %changelog
+ * Wed Sep 28 2011 Maxim Udushlivy <udushlivy at mail.ru> - 1.4.2p1-1
+ - Updated for POCO 1.4.2p1. Obsoleted .spec directives were removed.
+ 
+ * Wed Mar 23 2011 Dan Horák <dan at danny.cz> - 1.4.1p1-1.1
+ - rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
+ 
+ * Thu Feb 10 2011 Maxim Udushlivy <udushlivy at mail.ru> - 1.4.1p1-1
+ - Updated for POCO 1.4.1p1.
+ 
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-1.1
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
+ * Tue Feb 01 2011 Maxim Udushlivy <udushlivy at mail.ru> - 1.4.1-1
+ - Updated for POCO 1.4.1.
+ 
 +* Mon Jan 24 2011 Matěj Cepl <mcepl at redhat.com> - 1.3.5-9
 +- Add expat-devel as a dependency of poco-devel (#669708)
 +
+ * Fri Jan 21 2011 Maxim Udushlivy <udushlivy at mail.ru> - 1.4.0-1
+ - Updated for POCO 1.4.0. The "syslibs" patch was removed.
 -- This release enables a small part of the PCRE library to be 
 -compiled-in, which is unavoidable since POCO uses some internal PCRE 
 -functions for Unicode classification and manipulation.
++- This release enables a small part of the PCRE library to be
++  compiled-in, which is unavoidable since POCO uses some internal
++  PCRE functions for Unicode classification and manipulation.
+ 
+ * 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.
+ 
+ * 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).
++- 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.
++- The "make" invocation command in the %%build section was
++  modified to skip premature symbol stripping from retail
++  libraries.
  
  * Mon Nov 16 2009 Maxim Udushlivy <udushlivy at mail.ru> - 1.3.5-7
--- A removal of the "Foundation/src/MSG00001.bin" binary file was added 
--to the "%%prep" section.
--- Values for the top "Summary", "Group" and "%%description" were 
--restored.
++- A removal of the "Foundation/src/MSG00001.bin" binary file was
++  added to the "%%prep" section.
++- Values for the top "Summary", "Group" and "%%description" were
++  restored.
  - A "BuildRoot" tag was added.
  
  * Fri Nov 13 2009 Maxim Udushlivy <udushlivy at mail.ru> - 1.3.5-6
@@@ -394,29 -461,29 +464,30 @@@
  - The usage of %% symbol in the %%changelog section was fixed.
  
  * Wed Nov 11 2009 Maxim Udushlivy <udushlivy at mail.ru> - 1.3.5-5
--- A patch "poco-1.3.5-syslibs.patch" was added. The build process now 
--does not use bundled versions of the system libraries (zlib, pcre, 
--sqlite and expat).
++- A patch "poco-1.3.5-syslibs.patch" was added. The build process
++  now does not use bundled versions of the system libraries
++  (zlib, pcre, sqlite and expat).
  
  * Fri Nov 06 2009 Maxim Udushlivy <udushlivy at mail.ru> - 1.3.5-4
--- The name of "poco-testing" subpackage was reverted to "poco-debug".
++- The name of "poco-testing" subpackage was reverted to
++  "poco-debug".
  - The "Release" field was fixed to use "%%{?dist}".
  - The ".*DS_Store" files removal was moved to the %%prep section.
--- Fedora compilation flags (%%{optflags}) are now injected into the 
--"configure" script.
++- Fedora compilation flags (%%{optflags}) are now injected into
++  the "configure" script.
  
  * Wed Nov 04 2009 Maxim Udushlivy <udushlivy at mail.ru> - 1.3.5-3
--- Each POCO component is now put in its own binary package. The "poco" 
--package is now a meta package.
++- Each POCO component is now put in its own binary package. The
++  "poco" package is now a meta package.
  - Option "-s" was removed from the "make" invocation commands.
  - "perl" was replaced by "sed" for string substitutions in Makefile's.
  
  * Tue Jun 23 2009 Maxim Udushlivy <udushlivy at mail.ru> - 1.3.5-2
--- The "poco-extra" subpackage was split into separate "poco-odbc", 
--"poco-mysql" and "poco-zip".
++- The "poco-extra" subpackage was split into separate
++  "poco-odbc", "poco-mysql" and "poco-zip".
  - The "poco-debug" subpackage was renamed to "poco-testing".
--- The "poco-doc" subpackage with the API reference documentation 
--was added.
++- The "poco-doc" subpackage with the API reference documentation
++  was added.
  
  * Sat Jun 20 2009 Maxim Udushlivy <udushlivy at mail.ru> - 1.3.5-1
  - The first version.
