Hello community,

here is the log from the commit of package ooRexx for openSUSE:Factory checked 
in at 2018-06-28 15:14:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ooRexx (Old)
 and      /work/SRC/openSUSE:Factory/.ooRexx.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ooRexx"

Thu Jun 28 15:14:17 2018 rev:19 rq:619419 version:4.2.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/ooRexx/ooRexx.changes    2018-03-16 
10:45:13.464421668 +0100
+++ /work/SRC/openSUSE:Factory/.ooRexx.new/ooRexx.changes       2018-06-28 
15:14:18.359495363 +0200
@@ -1,0 +2,10 @@
+Wed Jun 27 14:57:02 UTC 2018 - [email protected]
+
+-  boo#1083875: removing unneeded attributes from /etc/alternatives entries.
+
+-------------------------------------------------------------------
+Tue Jun 26 19:29:10 UTC 2018 - [email protected]
+
+- boo#1083875: update-alternatives support re-done to avoid conflicts with 
Regina REXX.
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ ooRexx.spec ++++++
--- /var/tmp/diff_new_pack.kkKE2G/_old  2018-06-28 15:14:19.651492996 +0200
+++ /var/tmp/diff_new_pack.kkKE2G/_new  2018-06-28 15:14:19.655492989 +0200
@@ -187,7 +187,7 @@
 #******************************************************************************
 %install
 #******************************************************************************
-make DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir} mandir=%{_mandir} 
pkgdatadir=%{_datadir}/ooRexx install
+make DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir} mandir=%{_datadir}/ooRexx 
pkgdatadir=%{_datadir}/ooRexx install
 
 # REXX system-wide RPM macros
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rpm
@@ -224,12 +224,11 @@
 BINARIES="rexx rexxc rxqueue"
 for f in ${BINARIES}; do
                mv %{buildroot}/%{_bindir}/$f %{buildroot}/%{_bindir}/$f.oorexx
-        ln -s -f %{_sysconfdir}/alternatives/$f %{buildroot}%{_bindir}/$f
 done        
 
 # strangely, SLE11 requires a dummy file for the ghost-marked files(?)
 %if 0%{?suse_version} < 1230
-touch %{buildroot}%{_sysconfdir}/alternatives/{rexx,rexxc,rxqueue}
+touch 
%{buildroot}%{_sysconfdir}/alternatives/{rexx,rexxc,rxqueue,rexx.1,rexxc.1,rxqueue.1,rxsubcom.1,oorexx-config.1}
 %endif
 
 #******************************************************************************
@@ -246,11 +245,8 @@
 %doc
 %dir %{_datadir}/ooRexx
 %config %{_sysconfdir}/rpm/macros.rexx
-%{_bindir}/rexx
 %{_bindir}/rexx.oorexx
-%{_bindir}/rexxc
 %{_bindir}/rexxc.oorexx
-%{_bindir}/rxqueue
 %{_bindir}/rxqueue.oorexx
 %{_bindir}/rxapi
 %{_bindir}/rxapid
@@ -267,9 +263,13 @@
 %{_datadir}/ooRexx/mime.cls
 %{_datadir}/ooRexx/smtp.cls
 
-%ghost %attr(0755,root,root) %{_sysconfdir}/alternatives/rexx
-%ghost %attr(0755,root,root) %{_sysconfdir}/alternatives/rexxc
-%ghost %attr(0755,root,root) %{_sysconfdir}/alternatives/rxqueue
+%ghost %{_sysconfdir}/alternatives/rexx
+%ghost %{_sysconfdir}/alternatives/rexxc
+%ghost %{_sysconfdir}/alternatives/rxqueue
+%ghost %{_sysconfdir}/alternatives/rexx.1
+%ghost %{_sysconfdir}/alternatives/rexxc.1
+%ghost %{_sysconfdir}/alternatives/rxqueue.1
+%ghost %{_sysconfdir}/alternatives/rxsubcom.1
 
 %{_libdir}/librexx.so
 %{_libdir}/librexx.so.4
@@ -296,10 +296,11 @@
 %{_libdir}/librxunixsys.so.4
 %{_libdir}/librxunixsys.so.%{orx_libversion}
 
-%{_mandir}/man1/rexx.1.gz
-%{_mandir}/man1/rexxc.1.gz
-%{_mandir}/man1/rxsubcom.1.gz
-%{_mandir}/man1/rxqueue.1.gz
+%dir %{_datadir}/ooRexx/man1
+%{_datadir}/ooRexx/man1/rexx.1
+%{_datadir}/ooRexx/man1/rexxc.1
+%{_datadir}/ooRexx/man1/rxsubcom.1
+%{_datadir}/ooRexx/man1/rxqueue.1
 %{_datadir}/ooRexx/rexx.sh
 %{_datadir}/ooRexx/rexx.csh
 %{_datadir}/ooRexx/*.rex
@@ -318,7 +319,8 @@
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/oorexx-config
-%{_mandir}/man1/oorexx-config.1.gz
+%{_datadir}/ooRexx/man1/oorexx-config.1
+%ghost %{_sysconfdir}/alternatives/oorexx-config.1
 %{_includedir}/rexx.h
 %{_includedir}/rexxapidefs.h
 %{_includedir}/rexxapitypes.h
@@ -360,12 +362,33 @@
                %{_bindir}/$f $f %{_bindir}/$f.oorexx 10
 done
    
+for f in $(find %{_datadir}/ooRexx/man1 -type f); do
+               NAME=$(basename $f)
+               update-alternatives --install \
+        %{_mandir}/man1/${NAME} ${NAME} %{_datadir}/ooRexx/man1/${NAME} 10
+done   
+
+%post devel
+update-alternatives --install \
+        %{_mandir}/man1/oorexx-config.1 oorexx-config.1 
%{_datadir}/ooRexx/man1/oorexx-config.1 10
 
 #******************************************************************************
 %preun
 %if 0%{?suse_version} > 1230
 %service_del_preun ooRexx.service
 %endif
+BINARIES="rexx rexxc rxqueue"
+for f in ${BINARIES}; do
+       if [ ! -f %{_bindir}/$f ] ; then
+               update-alternatives --remove $f %{_bindir}/$f
+       fi
+done
+
+for f in $(find %{_datadir}/ooRexx/man1 -type f); do
+               NAME=$(basename $f)
+               update-alternatives --remove ${NAME} %{_mandir}/man1/${NAME}
+done
+
 #******************************************************************************
 %postun
 #******************************************************************************
@@ -378,12 +401,8 @@
 
 /sbin/ldconfig
 
-BINARIES="rexx rexxc rxqueue"
-for f in ${BINARIES}; do
-       if [ ! -f %{_bindir}/$f ] ; then
-               update-alternatives --remove $f %{_bindir}/$f
-       fi
-done
+%preun devel
+update-alternatives --remove oorexx-config.1 %{_mandir}/man1/oorexx-config.1
 
 #******************************************************************************
 


Reply via email to