[packaging] .gitignore libkolab.spec sources

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Fri Aug 3 17:30:11 CEST 2012


 .gitignore    |    1 +
 libkolab.spec |   39 +++++++++++++++++++++++++++++----------
 sources       |    2 +-
 3 files changed, 31 insertions(+), 11 deletions(-)

New commits:
commit fd3168e4d0502621614501589dfd99849cf65927
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Aug 3 16:27:45 2012 +0100

    Check in libkolab-0.3.0

diff --git a/.gitignore b/.gitignore
index add44ba..982a49e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /libkolab-0.2.0.tar.gz
 /libkolab-0.3.tar.gz
+/libkolab-0.3.0.tar.gz
diff --git a/libkolab.spec b/libkolab.spec
index f6c777b..bba271d 100644
--- a/libkolab.spec
+++ b/libkolab.spec
@@ -1,12 +1,21 @@
+%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d/}
+
+# Filter out private python and php libs. Does not work on EPEL5,
+# therefor we use it conditionally
+%{?filter_setup:
+%filter_provides_in %{python_sitearch}/.*\.so$
+%filter_provides_in %{php_extdir}/.*\.so$
+%filter_setup
+}
+
 Name:           libkolab
-Version:        0.3
-Release:        9.git06075443%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        Kolab Object Handling Library
 
 License:        LGPLv3+
 URL:            http://git.kolab.org/libkolab
 
-# From http://git.kolab.org/libkolab/snapshot/30c5f9659fa32a96efc2fee98f1d109e06075443.tar.gz
 Source0:        http://git.kolab.org/%{name}/snapshot/%{name}-%{version}.tar.gz
 
 %if 0%{?rhel} > 6 || 0%{?fedora} > 17
@@ -14,10 +23,10 @@ BuildRequires:  kdepimlibs-devel >= 4.9
 %else
 # Note: available within kolabsys.com infrastructure only, as being (essentially) a
 # fork of various kde 4.9 libraries that depend on kde*, and that have no place in el6.
-BuildRequires:  libcalendaring-devel
+BuildRequires:  libcalendaring-devel >= 4.9
 %endif
 BuildRequires:  libcurl-devel
-BuildRequires:  libkolabxml-devel >= 0.7
+BuildRequires:  libkolabxml-devel >= 0.8
 BuildRequires:  php-devel
 BuildRequires:  python-devel
 BuildRequires:  qt-devel
@@ -33,9 +42,9 @@ BuildRequires:  kdepimlibs-devel >= 4.9
 %else
 # Note: available within kolabsys.com infrastructure only, as being (essentially) a
 # fork of various kde 4.9 libraries that depend on kde*, and that have no place in el6.
-BuildRequires:  libcalendaring-devel
+BuildRequires:  libcalendaring-devel >= 4.9
 %endif
-Requires:       libkolabxml-devel >= 0.7
+Requires:       libkolabxml-devel >= 0.8
 Requires:       php-devel
 Requires:       pkgconfig
 Requires:       python-devel
@@ -91,6 +100,15 @@ pushd build
 make install DESTDIR=%{buildroot}
 popd
 
+mkdir -p %{buildroot}/%{_datadir}/php
+mv %{buildroot}/%{php_extdir}/*.php %{buildroot}/%{_datadir}/php/.
+
+mkdir -p %{buildroot}/%{php_inidir}
+cat >%{buildroot}/%{php_inidir}/kolab.ini <<EOF
+extension=kolab-calendaring.so
+extension=kolab-icalendar.so
+EOF
+
 %check
 pushd build/tests
 ./benchmarktest || :
@@ -111,7 +129,7 @@ rm -rf %{buildroot}
 
 %files
 %{_libdir}/%{name}.so.0
-%{_libdir}/%{name}.so.0.3
+%{_libdir}/%{name}.so.%{version}
 
 %files devel
 %{_libdir}/%{name}.so
@@ -119,9 +137,10 @@ rm -rf %{buildroot}
 %{_includedir}/kolab
 
 %files -n php-kolab
-%{php_extdir}/calendaring.php
+%config(noreplace) %{php_inidir}/kolab.ini
+%{_datadir}/php/calendaring.php
 %{php_extdir}/kolab-calendaring.so
-%{php_extdir}/icalendar.php
+%{_datadir}/php/icalendar.php
 %{php_extdir}/kolab-icalendar.so
 
 %files -n python-kolab
diff --git a/sources b/sources
index db74d3d..9c68179 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1e223a2a5775428a906babea2b436803  libkolab-0.3.tar.gz
+9fce7cbbace0c813f1d9d621d9f8fee6  libkolab-0.3.0.tar.gz




More information about the packaging-commits mailing list