[soci/el5] Upstream integration

Denis Arnaud denisarnaud at fedoraproject.org
Sun Sep 21 18:48:12 UTC 2014


commit 69752688bf9e81e2687f5d5a1aaa80a37ee808bd
Author: Denis Arnaud <denis.arnaud_fedora at m4x.org>
Date:   Sun Sep 21 20:48:10 2014 +0200

    Upstream integration

 soci.spec |   19 ++++++++++++-------
 sources   |    2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/soci.spec b/soci.spec
index ceb5434..1000fd9 100644
--- a/soci.spec
+++ b/soci.spec
@@ -21,18 +21,18 @@
 ##
 #
 Name:           soci
-Version:        3.1.0
-Release:        1%{?dist}
+Version:        3.2.2
+Release:        2%{?dist}
 
 Summary:        The database access library for C++ programmers
 
 Group:          System Environment/Libraries
 License:        Boost
 URL:            http://%{name}.sourceforge.net
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.zip
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-BuildRequires:  cmake
+BuildRequires:  cmake28
 BuildRequires:  boost-devel
 BuildRequires:  libtool
 
@@ -197,10 +197,11 @@ library. The documentation is the same as at the %{name} web page.
 
 # Rename change-log and license file, so that they comply with
 # packaging standard
+mv README.md README
 mv CHANGES ChangeLog
 mv LICENSE_1_0.txt COPYING
-echo "2011-10-08:" > NEWS
-echo "- Version 3.1.0" >> NEWS
+echo "2013-04-13:" > NEWS
+echo "- Version 3.2.1" >> NEWS
 echo "- See the ChangeLog file for more details." >> NEWS
 
 
@@ -218,7 +219,8 @@ echo "- See the ChangeLog file for more details." >> NEWS
 mkdir tmpbuild
 pushd tmpbuild
 # -DCMAKE_INSTALL_PREFIX:PATH=$RPM_BUILD_ROOT
-%cmake \
+cmake28 \
+ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
  -DSOCI_EMPTY=%{?with_empty:ON}%{?without_empty:OFF} \
  -DSOCI_SQLITE3=%{?with_sqlite3:ON}%{?without_sqlite3:OFF} \
  -DSOCI_POSTGRESQL=%{?with_postgresql:ON}%{?without_postgresql:OFF} \
@@ -350,6 +352,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 21 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.2-1
+- Upstream integration
+
 * Mon Oct 31 2011 Denis Arnaud <denis.arnaud_fedora at m4x.org> 3.1.0-1
 - Upstream integration
 - New CMake build system
diff --git a/sources b/sources
index aaf62f7..ab831fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6ffac090b996bc34aedf4a29adf4595c  soci-3.1.0.zip
+bc3c35f6cd3f80a1be19fe30b3c111bf  soci-3.2.2.tar.gz


More information about the scm-commits mailing list