Hello community, here is the log from the commit of package ooRexx for openSUSE:Factory checked in at 2015-07-23 15:23:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ooRexx (Old) and /work/SRC/openSUSE:Factory/.ooRexx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ooRexx" Changes: -------- --- /work/SRC/openSUSE:Factory/ooRexx/ooRexx.changes 2015-03-05 18:17:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ooRexx.new/ooRexx.changes 2015-07-23 15:23:15.000000000 +0200 @@ -1,0 +2,20 @@ +Wed Jul 22 18:32:07 UTC 2015 - [email protected] + +- systemd-fixes.patch: Adds more fixes for the rxapid systemd service/preset as per SUSE's packaging guidelines. RXAPID now starts automatically as a systemd preset. +- Fixing wrong upstream permissions on REXX class files. + +------------------------------------------------------------------- +Tue Jul 21 20:18:49 UTC 2015 - [email protected] + +- Fixing up debian/Ubuntu build errors. +- Seens like .dsc just allow only one maintainer. + +------------------------------------------------------------------- +Tue Jul 21 18:04:23 UTC 2015 - [email protected] + +- Fixing up debian build warnings and errors. +- Using autoreconf instead of bootstrap. +- Removing linefeed conversions, fixed upstream. +- Using latest 4.2.0 sources from Sourceforge. + +------------------------------------------------------------------- New: ---- systemd-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ooRexx.spec ++++++ --- /var/tmp/diff_new_pack.ioFbaS/_old 2015-07-23 15:23:16.000000000 +0200 +++ /var/tmp/diff_new_pack.ioFbaS/_new 2015-07-23 15:23:16.000000000 +0200 @@ -92,12 +92,11 @@ %if %{suse_version} != 1315 BuildRequires: xalan-c %endif - -Requires: systemd -%define _unitdir /usr/lib/systemd/system +%{?systemd_requires} %endif Patch0: set_default_rexx_path.patch +Patch1: systemd-fixes.patch # Specify the libtool library version # The order of these looks wrong, but that is how it comes out! @@ -133,20 +132,15 @@ #****************************************************************************** %setup -q -dos2unix bootstrap -dos2unix configure.ac -dos2unix xsl.sh.in -find . -name *.cpp -exec dos2unix {} \; -chmod +x bootstrap - %patch0 -p1 - -./bootstrap +%patch1 -p0 #****************************************************************************** %build #****************************************************************************** +autoreconf -vfi + %if 0%{?suse_version} echo "SUSE_VERSION=%{suse_version}" %endif @@ -201,32 +195,24 @@ # Sort out systemd vs init depending on system version mkdir $RPM_BUILD_ROOT/sbin %if 0%{?suse_version} > 1230 -install -D -m644 %{buildroot}%{_datadir}/ooRexx/rxapid.service %{buildroot}%{_unitdir}/%{name}.service +mkdir -p %{buildroot}%{_unitdir} +mkdir -p %{buildroot}%{_presetdir} +install -D -m 444 %{buildroot}%{_datadir}/ooRexx/rxapid.service %{buildroot}%{_unitdir}/%{name}.service rm -f %{buildroot}%{_datadir}/ooRexx/rxapid.service -ln -s /%{_unitdir}/%{name}.service $RPM_BUILD_ROOT/sbin/rc%{name} +ln -s /sbin/service $RPM_BUILD_ROOT/sbin/rc%{name} +install -m 644 %{buildroot}%{_datadir}/ooRexx/50-rxapid.preset %{buildroot}%{_presetdir}/50-ooRexx.preset +rm -f %{buildroot}%{_datadir}/ooRexx/50-rxapid.preset %else mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d ln -s %{_bindir}/rxapid $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/rxapid ln -s /%{_sysconfdir}/init.d/rxapid $RPM_BUILD_ROOT/sbin/rcrxapid rm -f %{buildroot}%{_datadir}/ooRexx/rxapid.service +rm -f %{buildroot}%{_datadir}/ooRexx/50-rxapid.preset %endif -# Fix EOL in classes & scripts if needed -for f in $RPM_BUILD_ROOT/%{_datadir}/ooRexx/*.cls; do - dos2unix $f - chmod 644 $f -done - -for f in $RPM_BUILD_ROOT/%{_datadir}/ooRexx/*.rex; do - dos2unix $f -done - -dos2unix $RPM_BUILD_ROOT/%{_bindir}/oorexx-config -dos2unix $RPM_BUILD_ROOT/%{_datadir}/ooRexx/rexx.sh -dos2unix $RPM_BUILD_ROOT/%{_datadir}/ooRexx/rexx.csh -dos2unix $RPM_BUILD_ROOT/%{_bindir}/rxapid - -chmod 644 $RPM_BUILD_ROOT/usr/share/ooRexx/readme +# fix wrong permissions from the original package +chmod 644 %{buildroot}%{_datadir}/ooRexx/readme +chmod 644 %{buildroot}%{_datadir}/ooRexx/*cls #****************************************************************************** %clean @@ -294,6 +280,7 @@ %if 0%{?suse_version} > 1230 %{_unitdir}/%{name}.service +%{_presetdir}/50-ooRexx.preset /sbin/rcooRexx %else %{_sysconfdir}/init.d/rxapid ++++++ debian.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/changelog new/debian/changelog --- old/debian/changelog 2014-03-26 18:15:50.000000000 +0100 +++ new/debian/changelog 2015-07-21 21:11:13.000000000 +0200 @@ -1,24 +1,6 @@ -oorexx (4.2.0) stable; urgency=low +oorexx (1:4.2.0-1) unstable; urgency=high - * Updating to 4.2.0 final + * Initial release. - -- Perry Werneck <[email protected]> Mon, 03 Mar 2014 08:49:00 -0300 - -oorexx (4.2.0) unstable; urgency=low - - * Updating to 4.2.0 beta - - -- Perry Werneck <[email protected]> Mon, 16 Dec 2013 19:37:00 -0300 - -oorexx (4.1.3) stable; urgency=low - - * Updating to 4.1.3 file - - -- Perry Werneck <[email protected]> Mon, 8 Jul 2013 08:44:00 -0300 - -oorexx (4.1.2) stable; urgency=low - - * Initial Release - - -- Perry Werneck <[email protected]> Mon, 29 Apr 2013 07:31:00 -0300 + -- Erico Mendonca <[email protected]> Thu, 18 Nov 2010 17:25:32 -0300 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/compat new/debian/compat --- old/debian/compat 2014-03-26 18:15:50.000000000 +0100 +++ new/debian/compat 2015-07-21 21:50:09.000000000 +0200 @@ -1 +1 @@ -7 \ No newline at end of file +5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/control new/debian/control --- old/debian/control 2014-03-26 18:16:20.000000000 +0100 +++ new/debian/control 2015-07-21 21:58:20.000000000 +0200 @@ -1,12 +1,13 @@ Source: oorexx Section: unknown Priority: optional -Maintainer: Perry Werneck <[email protected]> -Build-Depends: debhelper (>= 7), autotools-dev, autoconf, gettext, lsb-base +Maintainer: Perry Werneck <[email protected]>, Erico Mendonca <[email protected]> +Build-Depends: debhelper(>=7.0.0), autotools-dev, autoconf, gettext, lsb-base +Standards-Version: 3.9.1.0 Package: oorexx Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends},${misc:Depends} Description: Open Object Rexx Open Object Rexx is an object-oriented scripting language. The language is designed for both beginners and experienced Rexx programmers. It is diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/copyright new/debian/copyright --- old/debian/copyright 1970-01-01 01:00:00.000000000 +0100 +++ new/debian/copyright 2015-07-21 19:43:16.000000000 +0200 @@ -0,0 +1,7 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Open Object Rexx +Source: http://www.oorexx.org/ + +Files: * +Copyright: Copyright 2007-2014 Rexx Language Association +License: CPL-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/postinst new/debian/postinst --- old/debian/postinst 2014-03-26 18:15:50.000000000 +0100 +++ new/debian/postinst 2015-07-21 18:55:58.000000000 +0200 @@ -1,3 +1,4 @@ #!/bin/bash ldconfig +#DEBHELPER# diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/postrm new/debian/postrm --- old/debian/postrm 2014-03-26 18:15:50.000000000 +0100 +++ new/debian/postrm 2015-07-21 18:55:37.000000000 +0200 @@ -1,3 +1,4 @@ #!/bin/bash ldconfig +#DEBHELPER# diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/rules new/debian/rules --- old/debian/rules 2014-09-26 14:52:44.000000000 +0200 +++ new/debian/rules 2015-07-21 19:39:05.000000000 +0200 @@ -5,9 +5,6 @@ # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 -# This is the debhelper compatibility version to use. -export DH_COMPAT=4 - CFLAGS = -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 @@ -18,18 +15,14 @@ LIBS += -ldl build: build-stamp +build-indep: build-stamp +build-arch: build-stamp build-stamp: dh_testdir # Add here commands to compile the package. - fromdos bootstrap - fromdos configure.ac - fromdos xsl.sh.in - find . -name *.cpp -exec fromdos {} \; - chmod +x bootstrap - - ./bootstrap + autoreconf -vfi ./configure CFLAGS="$(CFLAGS)" LIBS="$(LIBS)" --disable-static --prefix=/usr @@ -42,7 +35,7 @@ echo "Name: ooRexx" >> "ooRexx.pc" echo "Description: Open Object Rexx" >> "ooRexx.pc" - echo "Version: 4.1.3" >> "ooRexx.pc" + echo "Version: 4.2.0" >> "ooRexx.pc" echo "Libs: -L/usr/lib/ooRexx -lrexx -lrexxapi" >> "ooRexx.pc" echo "Cflags: -I/usr/include" >> "ooRexx.pc" @@ -60,51 +53,45 @@ rm -f ooRexx.pc # --- end custom part for cleaning up - dh_clean + dh_prep install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs # Add here commands to install the packages - make DESTDIR=$(PWD)/.install pkgdatadir=/usr/share/ooRexx install - - # Convert scripts - fromdos $(PWD)/.install/usr/bin/oorexx-config - fromdos $(PWD)/.install/usr/share/ooRexx/rexx.sh - fromdos $(PWD)/.install/usr/share/ooRexx/rexx.csh - fromdos $(PWD)/.install/usr/bin/rxapid + make DESTDIR=$(CURDIR)/.install pkgdatadir=/usr/share/ooRexx install # Move init script - mv $(PWD)/.install/usr/bin/rxapid $(PWD)/debian/oorexx.init + mv $(CURDIR)/.install/usr/bin/rxapid $(CURDIR)/debian/oorexx.init # Move development files - mkdir -p $(PWD)/debian/oorexx-dev/usr - mv -v $(PWD)/.install/usr/include $(PWD)/debian/oorexx-dev/usr + mkdir -p $(CURDIR)/debian/oorexx-dev/usr + mv -v $(CURDIR)/.install/usr/include $(CURDIR)/debian/oorexx-dev/usr - mkdir -p $(PWD)/debian/oorexx-dev/usr/lib/pkgconfig - install --mode=644 $(PWD)/ooRexx.pc $(PWD)/debian/oorexx-dev/usr/lib/pkgconfig/ooRexx.pc + mkdir -p $(CURDIR)/debian/oorexx-dev/usr/lib/pkgconfig + install --mode=644 $(CURDIR)/ooRexx.pc $(CURDIR)/debian/oorexx-dev/usr/lib/pkgconfig/ooRexx.pc # Move installation files - mkdir -p $(PWD)/debian/oorexx/usr - mv -v $(PWD)/.install/usr/bin $(PWD)/debian/oorexx/usr - mv -v $(PWD)/.install/usr/share $(PWD)/debian/oorexx/usr - mv -v $(PWD)/.install/usr/lib $(PWD)/debian/oorexx/usr + mkdir -p $(CURDIR)/debian/oorexx/usr + mv -v $(CURDIR)/.install/usr/bin $(CURDIR)/debian/oorexx/usr + mv -v $(CURDIR)/.install/usr/share $(CURDIR)/debian/oorexx/usr + mv -v $(CURDIR)/.install/usr/lib $(CURDIR)/debian/oorexx/usr # Create ldconfig file - mkdir -p $(PWD)/debian/oorexx/etc/ld.so.conf.d - echo "# Open Object Rexx configuration" > $(PWD)/debian/oorexx/etc/ld.so.conf.d/oorexx.conf - echo "/usr/lib/ooRexx" >> $(PWD)/debian/oorexx/etc/ld.so.conf.d/oorexx.conf + mkdir -p $(CURDIR)/debian/oorexx/etc/ld.so.conf.d + echo "# Open Object Rexx configuration" > $(CURDIR)/debian/oorexx/etc/ld.so.conf.d/oorexx.conf + echo "/usr/lib/ooRexx" >> $(CURDIR)/debian/oorexx/etc/ld.so.conf.d/oorexx.conf # Make main package file list - find $(PWD)/debian/oorexx -type f | sed -e "s@^$(PWD)/debian/oorexx/@/@g" > $(PWD)/debian/oorexx.install - cat $(PWD)/debian/oorexx.install + find $(CURDIR)/debian/oorexx -type f | sed -e "s@^$(CURDIR)/debian/oorexx/@/@g" > $(CURDIR)/debian/oorexx.install + cat $(CURDIR)/debian/oorexx.install # Make dev package file list - find $(PWD)/debian/oorexx-dev -type f | sed -e "s@^$(PWD)/debian/oorexx-dev/@/@g" > $(PWD)/debian/oorexx-dev.install - cat $(PWD)/debian/oorexx-dev.install + find $(CURDIR)/debian/oorexx-dev -type f | sed -e "s@^$(CURDIR)/debian/oorexx-dev/@/@g" > $(CURDIR)/debian/oorexx-dev.install + cat $(CURDIR)/debian/oorexx-dev.install # --- end custom part for installing ++++++ ooRexx-4.2.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/ooRexx/ooRexx-4.2.0.tar.bz2 /work/SRC/openSUSE:Factory/.ooRexx.new/ooRexx-4.2.0.tar.bz2 differ: char 11, line 1 ++++++ ooRexx.dsc ++++++ --- /var/tmp/diff_new_pack.ioFbaS/_old 2015-07-23 15:23:16.000000000 +0200 +++ /var/tmp/diff_new_pack.ioFbaS/_new 2015-07-23 15:23:16.000000000 +0200 @@ -1,12 +1,16 @@ Debtransform-Tar: ooRexx-4.2.0.tar.bz2 Debtransform-Files-Tar: debian.tar.gz Format: 1.0 -Source: ooRexx -Version: 4.2.0.1 +Source: oorexx +Version: 4.2.0-1 Binary: oorexx -Maintainer: Perry Werneck <[email protected]> +Maintainer: Erico Mendonca <[email protected]> +Uploaders: Perry Werneck <[email protected]> +Homepage: http://www.oorexx.org/ Architecture: any -Build-Depends: debhelper (>= 7), autotools-dev, automake, autoconf, libtool, bison, subversion, coreutils, patch, tofrodos +Build-Depends: debhelper (>= 7), autotools-dev, automake, autoconf, libtool, bison, patch, tofrodos, gettext, lsb-base +Standards-Version: 3.9.1.0 +DEBTRANSFORM-RELEASE: 1 Files: 00000000000000000000000000000000 000000 ooRexx-4.2.0.tar.bz2 00000000000000000000000000000000 000000 debian.tar.gz ++++++ systemd-fixes.patch ++++++ --- platform/unix/50-rxapid.preset.old 1969-12-31 21:00:00.000000000 -0300 +++ platform/unix/50-rxapid.preset 2015-07-22 14:27:29.244725157 -0300 @@ -0,0 +1 @@ +enable ooRexx.service --- platform/unix/rxapid.service 2013-12-21 15:47:12.667492000 -0200 +++ platform/unix/rxapid.service.new 2015-07-22 14:27:01.188725317 -0300 @@ -1,6 +1,5 @@ [Unit] Description=ooRexx rxapi service -After=syslog.target After=network.target [Service] @@ -11,4 +10,4 @@ Restart=on-abort [Install] -WantedBy=multi-user.target.wants +WantedBy=multi-user.target --- Makefile.am 2013-12-10 08:01:38.000000000 -0200 +++ Makefile.am.new 2015-07-22 14:45:56.549770684 -0300 @@ -369,7 +369,8 @@ $(build_os_platform_dir)/*.1 \ $(build_os_platform_dir)/oorexx.spec \ $(build_os_platform_dir)/oorexx-config \ - $(build_os_platform_dir)/rxapid.service + $(build_os_platform_dir)/rxapid.service \ + $(build_os_platform_dir)/50-rxapid.preset commonMiscFiles = $(top_srcdir)/CPLv1.0.txt \ $(top_srcdir)/CHANGES \ $(top_srcdir)/ReleaseNotes \ @@ -1120,6 +1121,7 @@ done; $(install_sh_SCRIPT) $(build_samples_dir)/readme $(DESTDIR)$(prefix)/share/ooRexx/readme $(install_sh_SCRIPT) $(platform_unix_dir)/rxapid.service $(DESTDIR)$(prefix)/share/ooRexx/rxapid.service + $(install_sh_SCRIPT) $(platform_unix_dir)/50-rxapid.preset $(DESTDIR)$(prefix)/share/ooRexx/50-rxapid.preset package: ./rexx $(build_os_platform_dir)/makepkg.rex @PACKAGETYPE@ $(ORX_MAJOR).$(ORX_MINOR).$(ORX_MOD_LVL) $(target) $(prefix) $(DESTDIR)
