[libkolab/el6: 8/18] Snapshot release with buildsystem changes

Jeroen van Meeuwen kanarip at fedoraproject.org
Thu Jun 28 12:31:16 UTC 2012


commit 9c4f6e72f008cb85956dbc94d8c3e3a49e8c87fc
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sat May 12 13:52:02 2012 +0100

    Snapshot release with buildsystem changes

 .gitignore    |    1 +
 libkolab.spec |   18 +++++++-----------
 sources       |    2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 19795cc..add44ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /libkolab-0.2.0.tar.gz
+/libkolab-0.3.tar.gz
diff --git a/libkolab.spec b/libkolab.spec
index 013219b..851c66f 100644
--- a/libkolab.spec
+++ b/libkolab.spec
@@ -1,5 +1,5 @@
 Name:           libkolab
-Version:        0.2.0
+Version:        0.3
 Release:        1%{?dist}
 Summary:        Kolab libraries
 
@@ -7,13 +7,12 @@ Group:          System/Libraries
 License:        LGPLv3+
 URL:            http://www.kolab.org
 Source0:        http://git.kolab.org/%{name}/snapshot/%{name}-%{version}.tar.gz
-Patch1:         libkolab-0.2.0-cmake-woos.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  cmake >= 2.6
 BuildRequires:  kdepimlibs-devel >= 4.8
-BuildRequires:  libkolabxml-devel >= 0.4
+BuildRequires:  libkolabxml-devel >= 0.5
 BuildRequires:  qt-devel >= 4.7
 Requires:       libkolabxml
 
@@ -26,7 +25,7 @@ Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       cmake >= 2.6
 Requires:       kdepimlibs-devel >= 4.8
-Requires:       libkolabxml-devel >= 0.4
+Requires:       libkolabxml-devel >= 0.5
 Requires:       qt-devel >= 4.7
 
 %description devel
@@ -34,7 +33,6 @@ Kolab library development headers
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 rm -rf build
@@ -42,12 +40,7 @@ mkdir -p build
 pushd build
 %{cmake} -Wno-fatal-errors -Wno-errors \
     -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_PREFIX_PATH=%{_libdir} \
-%if 0%{?rhel} < 6 && 0%{?fedora} < 15
-    -DBOOST_LIBRARYDIR=%{_libdir}/boost141 \
-    -DBOOST_INCLUDEDIR=%{_includedir}/boost141 \
-    -DBoost_ADDITIONAL_VERSIONS="1.41;1.41.0" \
-%endif
+    -DCMAKE_INSTALL_PREFIX=%{_prefix} \
     -DLIB_INSTALL_DIR=%{_libdir} \
     -DINCLUDE_INSTALL_DIR=%{_includedir}/kolab \
     ..
@@ -73,5 +66,8 @@ rm -rf %{buildroot}
 %{_includedir}/kolab
 
 %changelog
+* Sat May 12 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.3-1
+- Snapshot version after buildsystem changes
+
 * Wed May  2 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.2.0-1
 - First package
diff --git a/sources b/sources
index 72b797c..c6ed9c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5078028240aba578faa169d154581e63  libkolab-0.2.0.tar.gz
+f01679e7eb12cd85a6b3c0b30575b197  libkolab-0.3.tar.gz


More information about the scm-commits mailing list