Hello community,
here is the log from the commit of package multisync
checked in at Thu May 8 02:18:26 CEST 2008.
--------
--- multisync/multisync.changes 2007-10-11 16:39:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/multisync/multisync.changes 2008-05-07 16:02:24.000000000 +0200
@@ -1,0 +2,6 @@
+Wed May 7 16:02:06 CEST 2008 - schwab@suse.de
+
+- Use autoreconf and remove local libtool macros.
+- Fix recursive variable in makefile.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ multisync.spec ++++++
--- /var/tmp/diff_new_pack.OH4056/_old 2008-05-08 02:16:28.000000000 +0200
+++ /var/tmp/diff_new_pack.OH4056/_new 2008-05-08 02:16:28.000000000 +0200
@@ -1,14 +1,14 @@
#
# spec file for package multisync (Version 0.82+cvs)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+
Name: multisync
BuildRequires: bison bluez-libs curl-devel evolution-devel gnome-pilot kdelibs3-devel ldapcpplib libwnck-devel openldap2 openobex-devel pilot-link-devel wbxml2 xorg-x11
@@ -18,7 +18,7 @@
#Provides: multisync
Summary: A Calendar and Other PIM Data Synchronization Program
Version: 0.82+cvs
-Release: 141
+Release: 231
# Source: multisync-%{version}.tar.bz2
# Patch: multisync-%{version}.diff
# Patch1: autogen-%{version}.diff
@@ -111,7 +111,7 @@
%package irmc-bluetooth
Group: Productivity/Other
License: GPL v2 or later
-Summary: Bluetooth support for the IrMC plugin for MultiSync.
+Summary: Bluetooth support for the IrMC plugin for MultiSync
Requires: multisync = %{version} multisync-irmc = %{version} bluez-libs openobex
%description irmc-bluetooth
@@ -128,7 +128,7 @@
%package kdepim
Group: Productivity/Other
License: GPL v2 or later
-Summary: A KDE 3.x addressbook plugin for MultiSync.
+Summary: A KDE 3.x addressbook plugin for MultiSync
Requires: multisync = %{version} kdepim3
%description kdepim
@@ -144,7 +144,7 @@
%package opie
Group: Productivity/Other
License: GPL v2 or later
-Summary: An Opie/Zaurus plugin for MultiSync.
+Summary: An Opie/Zaurus plugin for MultiSync
Requires: multisync = %{version}
%description opie
@@ -162,7 +162,7 @@
%package syncml
Group: Productivity/Other
License: GPL v2 or later
-Summary: A SyncML plugin for MultiSync.
+Summary: A SyncML plugin for MultiSync
Requires: multisync = %{version} wbxml2
%description syncml
@@ -180,7 +180,7 @@
%package ldap
Group: Productivity/Other
License: GPL v2 or later
-Summary: A LDAP plugin for MultiSync.
+Summary: A LDAP plugin for MultiSync
Requires: multisync = %{version}
%description ldap
@@ -194,10 +194,11 @@
Based on the original Ldap plugin by Tobias Karlsson
%if %suse_version < 1001
+
%package palm
Group: Productivity/Other
License: GPL v2 or later
-Summary: A Palm Device plugin for MultiSync.
+Summary: A Palm Device plugin for MultiSync
Requires: multisync = %{version}
%description palm
@@ -210,6 +211,7 @@
Written by Armin Bauer
%endif
+
%prep
%setup -q
%patch -p1
@@ -243,9 +245,16 @@
make %{?jobs:-j %jobs}
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/multisync
for dir in plugins/{backup_plugin,evolution2_sync,kdepim_plugin,irmc_sync,opie_sync,syncml_plugin} ; do
- (cd ${dir}; \
- CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" PATH="$PATH:/opt/gnome/bin/" \
- CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" PATH="$PATH:/opt/gnome/bin/" \
+ (cd ${dir}
+ case $dir in */kdepim_plugin)
+ if test -f acinclude.m4; then
+ # Get rid of libtool macros
+ sed -i '/^# libtool.m4/,$d' acinclude.m4
+ fi ;;
+ esac
+ autoreconf -fi
+ CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" PATH="$PATH:/opt/gnome/bin" \
+ CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" PATH="$PATH:/opt/gnome/bin" \
LIBS="$LIBS -L/opt/gnome/%{_lib}" \
./autogen.sh --prefix=%{_prefix} \
--libdir=%{_libdir} \
@@ -255,17 +264,17 @@
--infodir=%{_infodir} \
--mandir=%{_mandir} \
--sysconfdir=%{_sysconfdir} \
- --with-evo-libs=/opt/gnome/%{_lib}/; \
- make %{?jobs:-j %jobs})
+ --with-evo-libs=/opt/gnome/%{_lib}
+ make %{?jobs:-j %jobs}) || exit
done
%if %suse_version < 1001
for dir in plugins/{ldap_plugin,palm_sync} ; do
%else
for dir in plugins/ldap_plugin ; do
%endif
- (cd ${dir}; \
- aclocal; \
- CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED" PATH="$PATH:/opt/gnome/bin/" \
+ (cd ${dir}
+ autoreconf -fi
+ CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED" PATH="$PATH:/opt/gnome/bin" \
LIBS="$LIBS -L/opt/gnome/%{_lib}" \
./configure --prefix=%{_prefix} \
--libdir=%{_libdir} \
@@ -275,14 +284,16 @@
--infodir=%{_infodir} \
--mandir=%{_mandir} \
--sysconfdir=%{_sysconfdir} \
- --with-evo-libs=/opt/gnome/%{_lib}/; \
- make %{?jobs:-j %jobs})
+ --with-evo-libs=/opt/gnome/%{_lib}
+ make %{?jobs:-j %jobs}) || exit
done
%install
-make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} libdir=%{_libdir} install
+make DESTDIR=$RPM_BUILD_ROOT install
for dir in plugins/*; do
- ( cd ${dir}; make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} libdir=%{_libdir}/%{name} install)
+ if test -f ${dir}/Makefile; then
+ ( cd ${dir}; make DESTDIR=$RPM_BUILD_ROOT install) || exit
+ fi
done
# currently I don't want that
rm $RPM_BUILD_ROOT/%{_prefix}/share/applications/multisync.desktop
@@ -407,101 +418,105 @@
%defattr(-,root,root)
%{_libdir}/%{name}/libsyncml_plugin.*
%doc %{_defaultdocdir}/multisync/plugins/syncml
+
%changelog
-* Thu Oct 11 2007 - sbrabec@suse.cz
+* Wed May 07 2008 schwab@suse.de
+- Use autoreconf and remove local libtool macros.
+- Fix recursive variable in makefile.
+* Thu Oct 11 2007 sbrabec@suse.cz
- Removed bogus dependency on mDNSResponder.
-* Tue Jun 05 2007 - cstender@suse.de
+* Tue Jun 05 2007 cstender@suse.de
- fixed build of multisync
- added multisync-irmc.diff
-* Fri Mar 30 2007 - rguenther@suse.de
+* Fri Mar 30 2007 rguenther@suse.de
- add bison BuildRequires
-* Sun Oct 29 2006 - meissner@suse.de
+* Sun Oct 29 2006 meissner@suse.de
- use RPM_OPT_FLAGS also for C++
-* Sun Oct 22 2006 - schwab@suse.de
+* Sun Oct 22 2006 schwab@suse.de
- Make sure config.rpath is present.
-* Mon Sep 18 2006 - dmueller@suse.de
+* Tue Sep 19 2006 dmueller@suse.de
- build parallel
-* Tue Sep 05 2006 - behlert@suse.de
+* Tue Sep 05 2006 behlert@suse.de
- added some 64 bit enablements (no bug seen, but as precaution)
- some Makefile.* cleanups
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Wed Jan 18 2006 - ro@suse.de
+* Wed Jan 18 2006 ro@suse.de
- fix build of evolution2 plugin
-* Tue Oct 25 2005 - rhafer@suse.de
+* Tue Oct 25 2005 rhafer@suse.de
- define LDAP_DEPRECATED additionally for ldap_plugin
-* Tue Oct 18 2005 - ro@suse.de
+* Tue Oct 18 2005 ro@suse.de
- disable palm plugin for the moment
-* Mon Sep 26 2005 - ro@suse.de
+* Mon Sep 26 2005 ro@suse.de
- define LDAP_DEPRECATED in CFLAGS
-* Fri Jul 08 2005 - behlert@suse.de
+* Fri Jul 08 2005 behlert@suse.de
- removed *.la-plugin/sync-files from packages
- added some files to doc-directories
-* Tue Jul 05 2005 - behlert@suse.de
+* Tue Jul 05 2005 behlert@suse.de
- fixed include for string.h in evolution2-plugin
-* Tue Apr 19 2005 - behlert@suse.de
+* Tue Apr 19 2005 behlert@suse.de
- fixed build with current gcc4
-* Tue Feb 22 2005 - ro@suse.de
+* Tue Feb 22 2005 ro@suse.de
- fix build on lib64 (again)
-* Mon Feb 14 2005 - behlert@suse.de
+* Mon Feb 14 2005 behlert@suse.de
- updated to latest cvs-version, removed some patches as a
consequence
-* Mon Feb 14 2005 - behlert@suse.de
+* Mon Feb 14 2005 behlert@suse.de
- updated evolution2-plugin
- added first version of kdepim-plugin
- specfile: neededforbuild-cleanup
-* Mon Feb 07 2005 - ro@suse.de
+* Mon Feb 07 2005 ro@suse.de
- added mDNSResponder to neededforbuild
-* Fri Jan 14 2005 - ro@suse.de
+* Fri Jan 14 2005 ro@suse.de
- fix evolution plugin build
-* Thu Oct 28 2004 - behlert@suse.de
+* Thu Oct 28 2004 behlert@suse.de
- added new evolution2-plugin, replacement for the evolution1
- added a few fixes for that plugin
-* Tue Oct 26 2004 - behlert@suse.de
+* Tue Oct 26 2004 behlert@suse.de
- heimdahl* -> kerberos-devel-packages in #neededforbuild
-* Thu Oct 14 2004 - ro@suse.de
+* Thu Oct 14 2004 ro@suse.de
- added gnutls et.al. to neededforbuild
-* Fri Sep 10 2004 - ro@suse.de
+* Fri Sep 10 2004 ro@suse.de
- added shared-mime-info to neededforbuild
-* Mon Jul 26 2004 - schwab@suse.de
+* Mon Jul 26 2004 schwab@suse.de
- Run autoreconf.
-* Thu Jul 15 2004 - behlert@suse.de
+* Thu Jul 15 2004 behlert@suse.de
- fixed Makefile.in/.am for bluez-libs >=2.8
-* Wed May 26 2004 - ro@suse.de
+* Wed May 26 2004 ro@suse.de
- disable evolution plugin
can not seem to build it with evolution-1.5
-* Thu May 06 2004 - behlert@suse.de
+* Thu May 06 2004 behlert@suse.de
- activated wbxml2 for syncml-plugin
- removed bluez-sdp, which is now obsoleted by bluez-libs and
bluez-utils
- irmc_sync/configure.in patched to work with new bluez-packages
-* Wed Apr 28 2004 - behlert@suse.de
+* Wed Apr 28 2004 behlert@suse.de
- updated to v0.82: primarily bugfixes and a few minor improvements
- cleanup of patches
- fixed libtool-problems
-* Sat Apr 24 2004 - sndirsch@suse.de
+* Sat Apr 24 2004 sndirsch@suse.de
- use xorg-x11 packages
-* Mon Mar 29 2004 - behlert@suse.de
+* Mon Mar 29 2004 behlert@suse.de
- fixed plugindir for 64bit
-* Wed Mar 24 2004 - behlert@suse.de
+* Wed Mar 24 2004 behlert@suse.de
- re-added third patch. I don't know why it got removed? I
fixed the hunks, if that was the problem?
- added autogen-0.81.diff which fixes the autoconf-prepare-system
of the plugins. Changes in /etc/profile.d/gnome-filesystem.sh
raised the bug. Now it builds again
-* Sat Mar 20 2004 - adrian@suse.de
+* Sat Mar 20 2004 adrian@suse.de
- fix build, adding resmgr to neededforbuild
-* Tue Feb 10 2004 - behlert@suse.de
+* Tue Feb 10 2004 behlert@suse.de
- stripped multisync-0.81.diff, removed patches included in other
two ones. multiple patches because the 'big' one is mostly approved
by upstream-maintainers and in the cvs, the newer ones are not (yet)
-* Tue Feb 10 2004 - behlert@suse.de
+* Tue Feb 10 2004 behlert@suse.de
- ldap and palm-plugins should now build although -Wall option is used.
-* Mon Feb 09 2004 - behlert@suse.de
+* Mon Feb 09 2004 behlert@suse.de
- fixed a few warnings during build on x86_64
-* Mon Feb 09 2004 - behlert@suse.de
+* Mon Feb 09 2004 behlert@suse.de
- fixed lib- vs. lib64-path bug in spec.
-* Thu Feb 05 2004 - behlert@suse.de
+* Thu Feb 05 2004 behlert@suse.de
- fixed authors
-* Wed Jan 28 2004 - behlert@suse.de
+* Wed Jan 28 2004 behlert@suse.de
- initial version
++++++ multisync-0.82cvs.diff ++++++
++++ 1283 lines (skipped)
++++ between multisync/multisync-0.82cvs.diff
++++ and /mounts/work_src_done/STABLE/multisync/multisync-0.82cvs.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org