Hello community, here is the log from the commit of package rarian for openSUSE:Factory checked in at Fri Jun 12 20:36:12 CEST 2009. -------- --- GNOME/rarian/rarian.changes 2008-10-31 06:28:36.000000000 +0100 +++ rarian/rarian.changes 2009-05-28 18:12:46.000000000 +0200 @@ -1,0 +2,12 @@ +Thu May 28 18:11:00 CEST 2009 - vuntz@novell.com + +- Add a scrollkeeper-compat package for scrollkeeper compatbility + binaries. +- Remove useless AutoReqProv: it's default now. +- Remove --disable-scrollkeeper-compat from configure. +- Use update-alternatives for the scrollkeeper tools so that + scrollkeeper and rarian-scrollkeeper-compat can both be + installed. +- Remove empty AUTHORS file. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rarian.spec ++++++ --- /var/tmp/diff_new_pack.T10699/_old 2009-06-12 20:35:40.000000000 +0200 +++ /var/tmp/diff_new_pack.T10699/_new 2009-06-12 20:35:40.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package rarian (Version 0.8.1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -28,7 +28,7 @@ BuildRequires: sgml-skel Summary: Rarian is designed to be a replacement for scrollkeeper Version: 0.8.1 -Release: 5 +Release: 6 Source0: %{name}-%{version}.tar.bz2 Patch1: rarian-0.5.6-reg-parse-bugs.patch Patch2: rarian-0.7.1-return.patch @@ -59,12 +59,36 @@ -------- Don Scorgie <Don@Scorgie.org> +%package scrollkeeper-compat +License: GPL v2 or later; LGPL v2.1 or later +Requires: %{name} = %{version} +Summary: Rarian is designed to be a replacement for scrollkeeper +Group: Development/Libraries/C and C++ +Requires(post): update-alternatives +Requires(postun): update-alternatives +# The build service fails to build the package because it doesn't really +# understand Requires(post), so use PreReq too (see bnc#439232). +%if %defined suse_version +PreReq: update-alternatives +%endif + +%description scrollkeeper-compat +Rarian is designed to be a replacement for scrollkeeper. It is +currently undergoing heavy development. As of writing, rarian can be +installed in place of scrollkeeper and everything will work okay (as +far as my testing indicates) + + + +Authors: +-------- + Don Scorgie <Don@Scorgie.org> + %package devel License: GPL v2 only Requires: %{name} = %{version} Summary: Development files for rarian Group: Development/Libraries/C and C++ -AutoReqProv: on %description devel Rarian is designed to be a replacement for scrollkeeper. It is @@ -80,11 +104,6 @@ -------- Don Scorgie <Don@Scorgie.org> -%define INSTALL install -m755 -s -%define INSTALL_DIR install -d -m755 -%define INSTALL_DATA install -m644 -%define INSTALL_SCRIPT install -m755 - %prep %setup -q #%setup -q -a 1 @@ -97,15 +116,17 @@ %patch7 -p1 %build -%configure --disable-static --with-pic --disable-scrollkeeper-compat +%configure --disable-static --with-pic %{__make} %{?jobs:-j%jobs} %install %makeinstall rm -f %{buildroot}%{_libdir}/*.la +# We use the update-alternatives system for those files: +rm -f %{buildroot}%{_bindir}/scrollkeeper-* %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post /sbin/ldconfig @@ -113,13 +134,38 @@ %postun /sbin/ldconfig +%post scrollkeeper-compat +update-alternatives \ + --install %{_bindir}/scrollkeeper-config scrollkeeper-config %{_bindir}/rarian-sk-config 10 \ + --slave %{_bindir}/scrollkeeper-extract scrollkeeper-extract %{_bindir}/rarian-sk-extract \ + --slave %{_bindir}/scrollkeeper-gen-seriesid scrollkeeper-gen-seriesid %{_bindir}/rarian-sk-gen-uuid \ + --slave %{_bindir}/scrollkeeper-get-cl scrollkeeper-get-cl %{_bindir}/rarian-sk-get-cl \ + --slave %{_bindir}/scrollkeeper-get-content-list scrollkeeper-get-content-list %{_bindir}/rarian-sk-get-content-list \ + --slave %{_bindir}/scrollkeeper-get-extended-content-list scrollkeeper-get-extended-content-list %{_bindir}/rarian-sk-get-extended-content-list \ + --slave %{_bindir}/scrollkeeper-get-index-from-docpath scrollkeeper-get-index-from-docpath %{_bindir}/rarian-sk-get-scripts \ + --slave %{_bindir}/scrollkeeper-get-toc-from-docpath scrollkeeper-get-toc-from-docpath %{_bindir}/rarian-sk-get-scripts \ + --slave %{_bindir}/scrollkeeper-get-toc-from-id scrollkeeper-get-toc-from-id %{_bindir}/rarian-sk-get-scripts \ + --slave %{_bindir}/scrollkeeper-install scrollkeeper-install %{_bindir}/rarian-sk-install \ + --slave %{_bindir}/scrollkeeper-preinstall scrollkeeper-preinstall %{_bindir}/rarian-sk-preinstall \ + --slave %{_bindir}/scrollkeeper-rebuilddb scrollkeeper-rebuilddb %{_bindir}/rarian-sk-rebuild \ + --slave %{_bindir}/scrollkeeper-uninstall scrollkeeper-uninstall %{_bindir}/rarian-sk-install \ + --slave %{_bindir}/scrollkeeper-update scrollkeeper-update %{_bindir}/rarian-sk-update + +%postun scrollkeeper-compat +update-alternatives --remove scrollkeeper-config %{_bindir}/rarian-sk-config + %files %defattr(-,root,root) -%doc COPYING AUTHORS README NEWS +%doc COPYING README NEWS %{_bindir}/* -#%{_datadir}/rarian %{_libdir}/lib*.so.* %{_prefix}/share/* +# in scrollkeeper-compat +%exclude %{_bindir}/rarian-sk-* + +%files scrollkeeper-compat +%defattr(-,root,root) +%{_bindir}/rarian-sk-* %files devel %defattr(-,root,root) @@ -128,6 +174,15 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu May 28 2009 vuntz@novell.com +- Add a scrollkeeper-compat package for scrollkeeper compatbility + binaries. +- Remove useless AutoReqProv: it's default now. +- Remove --disable-scrollkeeper-compat from configure. +- Use update-alternatives for the scrollkeeper tools so that + scrollkeeper and rarian-scrollkeeper-compat can both be + installed. +- Remove empty AUTHORS file. * Fri Oct 31 2008 vuntz@novell.com - Update rarian-opensuse-manuals.patch: no need to output an error for many localized files we won't file anyway. @@ -139,7 +194,7 @@ * Thu Sep 18 2008 jpr@novell.com - Remove parts of rarian-0.5.6-reg-parse-bugs.patch that are being applied upstream now and were causing a crash -* Thu Sep 11 2008 maw@suse.de +* Wed Sep 10 2008 maw@suse.de - Update to version 0.8.1: + Bugs fixed: bfo#15755, bfo#15654, bfo#15274, bfo#11839, bfo#14872, and bfo#12515. @@ -220,7 +275,7 @@ (bugs.freedesktop.org #12226). - Add rarian-0.5.6-docs-from-desktop-entries.patch, which lets us find documentation specified by applications' .desktop files. -* Sat Aug 04 2007 maw@suse.de +* Fri Aug 03 2007 maw@suse.de - BuildRequire gcc-c++ and pkg-config - s#%%run_ldconfig#/sbin/ldconfig# in %%post and add it to %%postun - Add abuild.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org