Hello community,

here is the log from the commit of package libkolabxml for openSUSE:Factory 
checked in at 2013-07-10 17:27:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old)
 and      /work/SRC/openSUSE:Factory/.libkolabxml.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libkolabxml"

Changes:
--------
--- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes  2013-06-21 
10:53:40.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes     
2013-07-10 17:27:21.000000000 +0200
@@ -6,0 +7,5 @@
+Sat Jun  8 21:38:31 UTC 2013 - [email protected]
+
+- Cleaning up spec file to reduce prjconf settings
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libkolabxml.spec ++++++
--- /var/tmp/diff_new_pack.FlVePX/_old  2013-07-10 17:27:21.000000000 +0200
+++ /var/tmp/diff_new_pack.FlVePX/_new  2013-07-10 17:27:21.000000000 +0200
@@ -16,6 +16,10 @@
 #
 
 
+%global phpdir php5
+%global php_extdir %{_libdir}/%{phpdir}/extensions
+%global php_inidir %{_sysconfdir}/%{phpdir}/conf.d
+
 %bcond_without mono
 
 Name:           libkolabxml
@@ -25,7 +29,7 @@
 Summary:        Kolab XML Format Schema Definitions Library
 License:        LGPL-3.0+
 Group:          Development/Libraries/C and C++
-Url:            http://wiki.kolab.org/Libkolabxml
+Url:            https://kolab.org/about/libkolabxml
 Source:         
http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
 # Fix uuid.h path on SLE* 11
 Patch0:         fix_uuid_includes_SLE.diff
@@ -39,7 +43,7 @@
 %if 0%{?sles_version} == 11
 BuildRequires:  uuid-devel = 1.6.2
 %endif
-BuildRequires:  libxerces-c-devel
+BuildRequires:  libXerces-c-devel
 %if %{with mono}
 BuildRequires:  mono-devel
 %endif
@@ -190,7 +194,7 @@
         -DCMAKE_SKIP_RPATH=TRUE  \
         -DJAVA_BINDINGS=TRUE -DJAVA_INSTALL_DIR=%{_jnidir} \
         -DCSHARP_BINDINGS=TRUE -DCSHARP_INSTALL_DIR=%{_prefix}/lib/mono/ \
-        -DPHP_BINDINGS=TRUE \
+        -DPHP_BINDINGS=TRUE -DPHP_INSTALL_DIR=%{php_extdir}\
         -DPYTHON_BINDINGS=TRUE -DPYTHON_INSTALL_DIR=%{python_sitearch} \
         ..
 
@@ -200,20 +204,14 @@
   cd build
   make DESTDIR=%{buildroot} install
 
-  %define php_extension_dir %( %{_bindir}/php-config --extension-dir | sed -e 
's#\\n##' )
-  %define php_inidir /etc/php5/conf.d
-
-  mkdir -p %{buildroot}/%{_datadir}/php5
-  mv %{buildroot}/%{php_extension_dir}/kolabformat.php 
%{buildroot}/%{_datadir}/php5/kolabformat.php
+  mkdir -p %{buildroot}/%{_datadir}/%{phpdir}
+  mv %{buildroot}/%{php_extdir}/kolabformat.php 
%{buildroot}/%{_datadir}/%{phpdir}/kolabformat.php
 
   mkdir -p %{buildroot}/%{php_inidir}/
-cat >%{buildroot}/%{php_inidir}/kolabformat.ini <<EOF
+  cat >%{buildroot}/%{php_inidir}/kolabformat.ini <<EOF
 extension=kolabformat.so
 EOF
 
-%clean
-rm -r %{buildroot}
-
 %post   -n %{name}%{soname} -p /sbin/ldconfig
 
 %postun -n %{name}%{soname} -p /sbin/ldconfig
@@ -233,8 +231,8 @@
 %defattr(-,root,root)
 %doc COPYING
 %config(noreplace) %{php_inidir}/kolabformat.ini
-%{_datadir}/php5/kolabformat.php
-%{php_extension_dir}/kolabformat.so
+%{_datadir}/%{phpdir}/kolabformat.php
+%{php_extdir}/kolabformat.so
 
 %files -n java-%{name}%{soname}
 %defattr(-,root,root)

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to