Hello community,

here is the log from the commit of package rarian for openSUSE:Factory checked 
in at 2017-09-19 16:20:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rarian (Old)
 and      /work/SRC/openSUSE:Factory/.rarian.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "rarian"

Tue Sep 19 16:20:36 2017 rev:41 rq:527112 version:0.8.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/rarian/rarian.changes    2017-02-11 
01:34:12.364085117 +0100
+++ /work/SRC/openSUSE:Factory/.rarian.new/rarian.changes       2017-09-19 
16:20:37.910709692 +0200
@@ -1,0 +2,10 @@
+Mon Sep 18 14:28:54 UTC 2017 - dims...@opensuse.org
+
+- Run spec-cleaner: resort the various sections.
+- Fix file lists, owning /etc/alternatives/* as ghost and real
+  files in /usr/bin (boo#994269).
+- Add rpmlintrc: Filter no-manual-page-for-binary and
+  self-obsoletion, which is intentional, based on the versions
+  simulated vs the last version of scrollkeeper we shipped.
+
+-------------------------------------------------------------------

New:
----
  rarian-rpmlintrc

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

Other differences:
------------------
++++++ rarian.spec ++++++
--- /var/tmp/diff_new_pack.NLci4k/_old  2017-09-19 16:20:38.638607089 +0200
+++ /var/tmp/diff_new_pack.NLci4k/_new  2017-09-19 16:20:38.642606525 +0200
@@ -17,20 +17,15 @@
 
 
 Name:           rarian
-BuildRequires:  docbook_4
-BuildRequires:  gcc-c++
-BuildRequires:  intltool
-BuildRequires:  libxslt-devel
-BuildRequires:  perl-XML-Parser
-BuildRequires:  pkg-config
-BuildRequires:  sgml-skel
-Summary:        Document cataloging system
-License:        GPL-2.0+ and LGPL-2.1+
-Group:          Development/Libraries/C and C++
 Version:        0.8.1
 Release:        0
+Summary:        Document cataloging system
+License:        GPL-2.0+ AND LGPL-2.1+
+Group:          Development/Libraries/C and C++
+Url:            ftp://ftp.gnome.org/pub/gnome/sources/rarian/
 Source0:        
http://download.gnome.org/sources/rarian/0.8/%{name}-%{version}.tar.bz2
 Source1:        scrollkeeper-omf.dtd
+Source99:       %{name}-rpmlintrc
 Patch1:         rarian-0.5.6-reg-parse-bugs.patch
 Patch2:         rarian-0.7.1-return.patch
 Patch3:         rarian-0.5.6-docs-from-desktop-entries-and-bundles.patch
@@ -48,9 +43,17 @@
 Patch9:         rarian-quiet.patch
 # PATCH-FIX-UPSTREAM rarian-no-warning-localized-icon.patch fdo#33560 
vu...@opensuse.org -- Icons can be localized, so don't warn for localized 
icons. It's not the fix that should go upstream, but a real fix would 
potentially imply some API break.
 Patch10:        rarian-no-warning-localized-icon.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Url:            ftp://ftp.gnome.org/pub/gnome/sources/rarian/
-PreReq:         /bin/touch sgml-skel /usr/bin/xmlcatalog
+BuildRequires:  docbook_4
+BuildRequires:  gcc-c++
+BuildRequires:  intltool
+BuildRequires:  libxslt-devel
+BuildRequires:  perl-XML-Parser
+BuildRequires:  pkgconfig
+BuildRequires:  sgml-skel
+# FIXME: use proper Requires(pre/post/preun/...)
+PreReq:         %{_bindir}/xmlcatalog
+PreReq:         /bin/touch
+PreReq:         sgml-skel
 
 %description
 Rarian is a document cataloging system.
@@ -58,23 +61,24 @@
 Rarian is designed to be a replacement for scrollkeeper.
 
 %package scrollkeeper-compat
-Requires:       %{name} = %{version}
 Summary:        Rarian is designed to be a replacement for scrollkeeper
-License:        GPL-2.0+ and LGPL-2.1+
+License:        GPL-2.0+ AND LGPL-2.1+
 Group:          Development/Libraries/C and C++
-Provides:       scrollkeeper
-Obsoletes:      scrollkeeper <= 0.3.14
+Requires:       %{name} = %{version}
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
+Provides:       scrollkeeper
+Obsoletes:      scrollkeeper <= 0.3.14
 
 %description scrollkeeper-compat
-Rarian is designed to be a replacement for scrollkeeper.
+Rarian is designed to be a replacement for scrollkeeper, and with this 
package, all your
+known scrollkeeper-based scripts and commands will transparently keep on 
working.
 
 %package devel
-Requires:       %{name} = %{version}
 Summary:        Development files for rarian
 License:        GPL-2.0
 Group:          Development/Libraries/C and C++
+Requires:       %{name} = %{version}
 
 %description devel
 Rarian is a document cataloging system.
@@ -96,10 +100,10 @@
 
 %build
 %configure --disable-static --with-pic
-%{__make} %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 # Prepare for the XML Catalog for scrollkeeper compatibility; snipped copied 
from scrollkeeper.spec
-xmlcatbin=/usr/bin/xmlcatalog
+xmlcatbin=%{_bindir}/xmlcatalog
 CATALOG=scrollkeeper.xml
 $xmlcatbin --noout --create $CATALOG
 $xmlcatbin --noout --add "public" \
@@ -124,25 +128,28 @@
 # End scrollkeeper compatibility
 
 %install
-%makeinstall
-rm -f %{buildroot}%{_libdir}/*.la
-# We use the update-alternatives system for those files:
-rm -f %{buildroot}%{_bindir}/scrollkeeper-*
+%make_install
+find %{buildroot} -type f -name "*.la" -delete -print
 # Install DTD as was shipped with scrollkeeper
 mkdir -p %{buildroot}%{_datadir}/xml/scrollkeeper/dtds
-cp %{S:1} %{buildroot}%{_datadir}/xml/scrollkeeper/dtds
+cp %{SOURCE1} %{buildroot}%{_datadir}/xml/scrollkeeper/dtds
 
 # Register the scrollkeeper DTDs for offline usage; replicated from 
scrollkeeper's .spec files
 # xml catalog
-cat_dir=%{buildroot}/etc/xml
+cat_dir=%{buildroot}%{_sysconfdir}/xml
 install -d -m755 $cat_dir
-# install -m644 %{name}.xml $RPM_BUILD_ROOT/etc/xml/%{name}.xml
 install -m644 %{FOR_ROOT_CAT} scrollkeeper.xml $cat_dir
 
-%post -p /sbin/ldconfig
+# Prepare for update-alternatives usage
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+
+for target in scrollkeeper-config scrollkeeper-extract 
scrollkeeper-gen-seriesid scrollkeeper-get-cl scrollkeeper-get-content-list 
scrollkeeper-get-extended-content-list scrollkeeper-get-index-from-docpath 
scrollkeeper-get-toc-from-docpath scrollkeeper-get-toc-from-id 
scrollkeeper-install scrollkeeper-preinstall scrollkeeper-rebuilddb 
scrollkeeper-uninstall scrollkeeper-update; do
+  ln -s -f %{_sysconfdir}/alternatives/$target %{buildroot}%{_bindir}/$target
+done
 
-%postun -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 %post scrollkeeper-compat
 # If the scrollkeeper-config group is in automatic mode, then this
 # will also switch all symlinks automatically
@@ -166,8 +173,8 @@
 %{_bindir}/rarian-sk-update
 
 # Register scrollkeeper DTD
-edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
-  --add /etc/xml/%{FOR_ROOT_CAT}
+edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
+  --add %{_sysconfdir}/xml/%{FOR_ROOT_CAT}
 
 %postun scrollkeeper-compat
 # Note: we don't use "$1 -eq 0", to avoid issues if the package gets renamed
@@ -176,65 +183,56 @@
 fi
 
 # remove entries only on removal of file
-if [ ! -f %{_sysconfdir}/xml/%{FOR_ROOT_CAT} -a -x /usr/bin/edit-xml-catalog ] 
; then
-  edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
+if [ ! -f %{_sysconfdir}/xml/%{FOR_ROOT_CAT} -a -x %{_bindir}/edit-xml-catalog 
] ; then
+  edit-xml-catalog --group --catalog %{_sysconfdir}/xml/suse-catalog.xml \
     --del %{name}-%{version}
 fi
 
-%posttrans
-# Workaround old bug in 11.1/11.2 packages that always removed the symlinks in
-# %postun. Can be removed during 12.2 development.
-if [ ! -f %{_bindir}/scrollkeeper-config -a -f %{_bindir}/rarian-sk-config ]; 
then
-  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
-fi
-
 %files
-%defattr(-,root,root)
 %doc COPYING README NEWS
 %{_bindir}/*
 %{_libdir}/lib*.so.*
-%{_prefix}/share/*
+%{_datadir}/*
 # in scrollkeeper-compat
+%exclude %{_bindir}/scrollkeeper-*
 %exclude %{_bindir}/rarian-sk-*
 %exclude %{_datadir}/xml/
 
 %files scrollkeeper-compat
-%defattr(-,root,root)
 %{_bindir}/rarian-sk-*
-%{_datadir}/xml/
-%{_sysconfdir}/xml/for-catalog-rarian-0.8.1.xml
-%{_sysconfdir}/xml/scrollkeeper.xml
-%ghost %{_bindir}/scrollkeeper-config
-%ghost %{_bindir}/scrollkeeper-extract
-%ghost %{_bindir}/scrollkeeper-gen-seriesid
-%ghost %{_bindir}/scrollkeeper-get-cl
-%ghost %{_bindir}/scrollkeeper-get-content-list
-%ghost %{_bindir}/scrollkeeper-get-extended-content-list
-%ghost %{_bindir}/scrollkeeper-get-index-from-docpath
-%ghost %{_bindir}/scrollkeeper-get-toc-from-docpath
-%ghost %{_bindir}/scrollkeeper-get-toc-from-id
-%ghost %{_bindir}/scrollkeeper-install
-%ghost %{_bindir}/scrollkeeper-preinstall
-%ghost %{_bindir}/scrollkeeper-rebuilddb
-%ghost %{_bindir}/scrollkeeper-uninstall
-%ghost %{_bindir}/scrollkeeper-update
+%{_datadir}/xml/*
+%config %{_sysconfdir}/xml/for-catalog-rarian-0.8.1.xml
+%config %{_sysconfdir}/xml/scrollkeeper.xml
+%{_bindir}/scrollkeeper-config
+%{_bindir}/scrollkeeper-extract
+%{_bindir}/scrollkeeper-gen-seriesid
+%{_bindir}/scrollkeeper-get-cl
+%{_bindir}/scrollkeeper-get-content-list
+%{_bindir}/scrollkeeper-get-extended-content-list
+%{_bindir}/scrollkeeper-get-index-from-docpath
+%{_bindir}/scrollkeeper-get-toc-from-docpath
+%{_bindir}/scrollkeeper-get-toc-from-id
+%{_bindir}/scrollkeeper-install
+%{_bindir}/scrollkeeper-preinstall
+%{_bindir}/scrollkeeper-rebuilddb
+%{_bindir}/scrollkeeper-uninstall
+%{_bindir}/scrollkeeper-update
+%ghost %{_sysconfdir}/alternatives/scrollkeeper-config
+%ghost %{_sysconfdir}/alternatives/scrollkeeper-extract
+%ghost %{_sysconfdir}/alternatives/scrollkeeper-gen-seriesid
+%ghost %{_sysconfdir}/alternatives/scrollkeeper-get-cl
+%ghost %{_sysconfdir}/alternatives/scrollkeeper-get-content-list
+%ghost %{_sysconfdir}/alternatives/scrollkeeper-get-extended-content-list
+%ghost %{_sysconfdir}/alternatives/scrollkeeper-get-index-from-docpath
+%ghost %{_sysconfdir}/alternatives/scrollkeeper-get-toc-from-docpath
+%ghost %{_sysconfdir}/alternatives/scrollkeeper-get-toc-from-id
+%ghost %{_sysconfdir}/alternatives/scrollkeeper-install
+%ghost %{_sysconfdir}/alternatives/scrollkeeper-preinstall
+%ghost %{_sysconfdir}/alternatives/scrollkeeper-rebuilddb
+%ghost %{_sysconfdir}/alternatives/scrollkeeper-uninstall
+%ghost %{_sysconfdir}/alternatives/scrollkeeper-update
 
 %files devel
-%defattr(-,root,root)
 %{_includedir}/*
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc

++++++ rarian-rpmlintrc ++++++
# rarian-sk* are scrollkeeper compat links
addFilter("no-manual-page-for-binary rarian-.*");
# The last version scrollkeeper matches the version of sk-compat's interface
addFilter("self-obsoletion scrollkeeper");

Reply via email to