Hello community,

here is the log from the commit of package capisuite for openSUSE:Factory
checked in at Fri May 20 15:26:26 CEST 2011.



--------
--- capisuite/capisuite.changes 2009-06-19 10:59:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/capisuite/capisuite.changes    2011-05-19 
22:13:32.000000000 +0200
@@ -1,0 +2,7 @@
+Thu May 3 10:10:11 UTC 2011 - idoen...@novell.com
+
+- Cleanup the package
+- Add capisuite-0.4.5-linkorder.patch to fix link order which lets
+  us enable as-needed support. 
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  capisuite-0.4.5-linkorder.patch

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

Other differences:
------------------
++++++ capisuite.spec ++++++
--- /var/tmp/diff_new_pack.zYhJVo/_old  2011-05-20 15:24:09.000000000 +0200
+++ /var/tmp/diff_new_pack.zYhJVo/_new  2011-05-20 15:24:09.000000000 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package capisuite (Version 0.4.5)
+# spec file for package capisuite
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,19 +15,15 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           capisuite
-BuildRequires:  capi4linux capi4linux-devel gcc-c++ libtiff-devel 
libxml2-devel python-devel sfftobmp
-License:        GPL v2 or later
-Group:          Hardware/ISDN
-AutoReqProv:    on
 Version:        0.4.5
-Release:        242
-%define pyver %(python -c 'import sys; print sys.version[:3]')
-Requires:       sfftobmp sox tiff ghostscript-library python >= %pyver, python 
< %{pyver}.99
+Release:        252
+License:        GPLv2+
 Summary:        ISDN Telecommunication Suite Providing Fax and Voice Services
+Url:            http://www.capisuite.de
+Group:          Hardware/ISDN
 Source0:        capisuite-%{version}.tar.bz2
 Patch0:         capisuite-%{version}-capi4linux_v3.diff
 Patch1:         capisuite-%{version}-python-v2.5.diff
@@ -36,9 +32,22 @@
 Patch4:         capisuite-%{version}-gcc43.diff
 Patch5:         capisuite-%{version}-sox.diff
 Patch6:         capisuite-%{version}-python-v2.6.diff
-Url:            http://www.capisuite.de
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+# PATCH-FIX-UPSTREAM capisuite-0.4.5-linkorder.path idoen...@suse.de -- Fix 
library link order
+Patch7:         capisuite-%{version}-linkorder.patch
+BuildRequires:  capi4linux
+BuildRequires:  capi4linux-devel
+BuildRequires:  gcc-c++
+BuildRequires:  libtiff-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  python-devel
+BuildRequires:  sfftobmp
 PreReq:         %insserv_prereq
+%py_requires
+Requires:       ghostscript-library
+Requires:       sfftobmp
+Requires:       sox
+Requires:       tiff
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 CapiSuite is an ISDN telecommunication suite providing easy to use
@@ -50,12 +59,6 @@
 handling and fax sending. See /usr/share/doc/packages/capisuite for
 further information.
 
-
-
-Authors:
---------
-    Gernot Hillier
-
 %prep
 %setup -q
 %patch0 -p1
@@ -65,29 +68,25 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7
 
 %build
-# This package failed when testing with -Wl,-as-needed being default.
-# So we disable it here, if you want to retest, just delete this comment and 
the line below.
-export SUSE_ASNEEDED=0
-aclocal
-autoheader
-autoconf
-./configure --prefix=/usr --mandir=%{_mandir} --sysconfdir=/etc 
--localstatedir=/var --with-docdir=%{_defaultdocdir}/capisuite 
-make CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
+autoreconf -fi
+%configure --with-docdir=%{_defaultdocdir}/capisuite
+make
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-mkdir -p $RPM_BUILD_ROOT/usr/sbin
-mkdir -p $RPM_BUILD_ROOT/etc/cron.daily
-install -m 644 cronjob.conf $RPM_BUILD_ROOT/etc/capisuite/cronjob.conf
-install -m 755 rc.capisuite $RPM_BUILD_ROOT/etc/init.d/capisuite
-install -m 755 capisuite.cron $RPM_BUILD_ROOT/etc/cron.daily/suse-capisuite
-ln -sf ../../etc/init.d/capisuite $RPM_BUILD_ROOT/usr/sbin/rccapisuite
+%makeinstall
+mkdir -p %{buildroot}%{_sysconfdir}/init.d
+mkdir -p %{buildroot}%{_prefix}/sbin
+mkdir -p %{buildroot}%{_sysconfdir}/cron.daily
+install -m 644 cronjob.conf %{buildroot}%{_sysconfdir}/capisuite/cronjob.conf
+install -m 755 rc.capisuite %{buildroot}%{_initddir}/capisuite
+install -m 755 capisuite.cron 
%{buildroot}%{_sysconfdir}/cron.daily/suse-capisuite
+ln -sf ../../etc/init.d/capisuite %{buildroot}%{_sbindir}/rccapisuite
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %preun
 %{stop_on_removal capisuite}
@@ -98,25 +97,25 @@
 
 %files
 %defattr(-,root,root)
-%dir /etc/capisuite
-%config /etc/capisuite/cronjob.conf
-%config /etc/capisuite/capisuite.conf
-%config /etc/capisuite/fax.conf
-%config /etc/capisuite/answering_machine.conf
-/usr/sbin/capisuite
-/usr/bin/capisuitefax
+%dir %{_sysconfdir}/capisuite
+%config %{_sysconfdir}/capisuite/cronjob.conf
+%config %{_sysconfdir}/capisuite/capisuite.conf
+%config %{_sysconfdir}/capisuite/fax.conf
+%config %{_sysconfdir}/capisuite/answering_machine.conf
+%{_sbindir}/capisuite
+%{_bindir}/capisuitefax
 %doc %{_defaultdocdir}/capisuite
-/usr/share/capisuite
-/usr/lib/capisuite
-/var/spool/capisuite
-/usr/%{_lib}/python2.?/site-packages/cs_helpers.py
-/etc/init.d/capisuite
-/etc/cron.daily/suse-capisuite
-/usr/sbin/rccapisuite
-%doc %{_mandir}/man1/capisuitefax.1.gz
-%doc %{_mandir}/man5/answering_machine.conf.5.gz
-%doc %{_mandir}/man5/capisuite.conf.5.gz
-%doc %{_mandir}/man5/fax.conf.5.gz
-%doc %{_mandir}/man8/capisuite.8.gz
+%{_datadir}/capisuite
+%{_libdir}/capisuite
+%{_localstatedir}/spool/capisuite
+%{_libdir}/python2.?/site-packages/cs_helpers.py
+%{_sysconfdir}/init.d/capisuite
+%{_sysconfdir}/cron.daily/suse-capisuite
+%{_sbindir}/rccapisuite
+%doc %{_mandir}/man1/capisuitefax.1%{ext_man}
+%doc %{_mandir}/man5/answering_machine.conf.5%{ext_man}
+%doc %{_mandir}/man5/capisuite.conf.5%{ext_man}
+%doc %{_mandir}/man5/fax.conf.5%{ext_man}
+%doc %{_mandir}/man8/capisuite.8%{ext_man}
 
 %changelog

++++++ capisuite-0.4.5-linkorder.patch ++++++
--- acinclude.m4        2007-08-02 21:34:26.000000000 +0200
+++ acinclude.m4        2007-08-02 21:42:36.000000000 +0200
@@ -155,7 +155,7 @@ 
 _python_libbasemod=`grep '^BASEMODLIBS=' $python_configdir/Makefile | sed 
's/^.*=//'`
 
 pgac_tab="     " # tab character
-python_libspec=`echo X"$_python_libs $_python_libc $_python_libm 
-lpython$python_version $_python_liblocalmod $_python_libbasemod" | sed -e 
's/^X//' -e "s/[[ $pgac_tab]][[ $pgac_tab]]*/ /g"`
+python_libspec=`echo X"-lpython$python_version $_python_liblocalmod 
$_python_libbasemod $_python_libm $_python_libs $_python_libc" | sed -e 
's/^X//' -e "s/[[ $pgac_tab]][[ $pgac_tab]]*/ /g"`
 LIBS="$LIBS $python_libspec"
 LDFLAGS="$LDFLAGS -L$python_configdir $python_linkforshared"
 AC_MSG_RESULT([${python_libspec}])

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



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to