Hello community, here is the log from the commit of package ooRexx for openSUSE:Factory checked in at 2014-10-11 19:26:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-08-01 07:08:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ooRexx.new/ooRexx.changes 2014-10-11 19:27:15.000000000 +0200 @@ -0,0 +1,9 @@ + + +------------------------------------------------------------------- +Thu Oct 9 12:13:45 UTC 2014 - [email protected] + +- new version 4.2.0 +- A list of the bugs fixed upstream can be found at http://sourceforge.net/projects/oorexx/files/oorexx/4.2.0/CHANGES.txt/download +- removed fixes-rpmlint.patch, as it is no longer necessary (fixed upstream). +- removed update_init_script.patch, as it is no longer necessary (fixed upstream). @@ -5 +14,3 @@ - Follow the packaging guidelines. +- Follow the packaging guidelines. +------------------------------------------------------------------- +Mon Dec 9 13:34:00 UTC 2013 - [email protected] @@ -6,0 +18 @@ +- Updating to ooRexx 4.2.0 beta @@ -11 +22,0 @@ - @@ -16 +26,0 @@ - @@ -21 +30,0 @@ - @@ -25,0 +35,2 @@ +------------------------------------------------------------------- +Tue Oct 16 2012 [email protected] @@ -26,0 +38 @@ +- adding patches and spec fixes necessary for correct building. @@ -31 +42,0 @@ - @@ -36 +46,0 @@ - Old: ---- _service debian.changelog debian.compat debian.control debian.oorexx.postinst debian.oorexx.postrm debian.rules debian.series fixes-rpmlint.patch ooRexx-4.1.3.tar.bz2 update_init_script.patch New: ---- debian.tar.gz ooRexx-4.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ooRexx.spec ++++++ --- /var/tmp/diff_new_pack.rgrTcq/_old 2014-10-11 19:27:16.000000000 +0200 +++ /var/tmp/diff_new_pack.rgrTcq/_new 2014-10-11 19:27:16.000000000 +0200 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %if 0%{?_unknownos} %define _unknownos 0 %endif @@ -45,7 +44,7 @@ %endif # SuSE -%if 0%{?_suse} +%if 0%{?suse_version} %define build_distro %(grep -q "openSUSE" /etc/SuSE-release && echo opensuse || echo sles) %define build_version %{suse_version} %define _osdistname %{build_distro}%{build_version} @@ -65,38 +64,43 @@ Name: ooRexx Prefix: /usr -Version: 4.1.3 +Version: 4.2.0 Release: 0 Summary: Open Object Rexx -License: CPL-1.0 Group: Development/Languages/Other -Url: http://www.oorexx.org/ +License: CPL-1.0 +URL: http://www.oorexx.org/ Source: %{name}-%{version}.tar.bz2 -Source1: ooRexx-rpmlintrc +Source1: %{name}-rpmlintrc # If we don't include the following option we get bogus dependencies generated -AutoReq: 0 +Autoreq: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: gcc-c++ +BuildRequires: bison BuildRequires: autoconf BuildRequires: automake -BuildRequires: bison -BuildRequires: dos2unix -BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkgconfig +BuildRequires: dos2unix +BuildRequires: coreutils +BuildRequires: subversion -Patch0: fixes-rpmlint.patch -Patch1: set_default_rexx_path.patch -Patch2: update_init_script.patch +%if 0%{?suse_version} > 1230 +BuildRequires: xalan-c +Requires: systemd +%define _unitdir /usr/lib/systemd/system +%endif + +Patch0: set_default_rexx_path.patch # Specify the libtool library version # The order of these looks wrong, but that is how it comes out! -%define orx_libversion 4.0.5 +%define orx_libversion 4.0.6 %package devel Summary: Open Object Rexx development files Group: Development/Languages/Other -Requires: %{name} -Requires: glibc-devel +Requires: %{name}, glibc-devel #****************************************************************************** %description @@ -122,18 +126,28 @@ %prep #****************************************************************************** %setup -q -%patch0 -p0 -%patch1 -p1 -%patch2 -p1 -%{?suse_update_config:%{suse_update_config -f}} -autoreconf -fvi + +dos2unix bootstrap +dos2unix configure.ac +dos2unix xsl.sh.in +find . -name *.cpp -exec dos2unix {} \; +chmod +x bootstrap + +%patch0 -p1 + +./bootstrap #****************************************************************************** %build #****************************************************************************** -# Fixes the "undefined reference to dlopen()" error -export SUSE_ASNEEDED=0 + +%if 0%{?suse_version} +echo "SUSE_VERSION=%{suse_version}" +%endif + export CFLAGS="$CFLAGS $RPM_OPT_FLAGS" +#export LDFLAGS="-ldl" +export SUSE_ASNEEDED=0 ./configure --disable-static --prefix=%{_prefix} make %{?_smp_mflags} libdir=%{_libdir} pkgdatadir=%{_datadir}/ooRexx @@ -141,7 +155,7 @@ cat > rpmmacros.rexx << EOF %_ooRexx $(echo %{version} | cut -d. -f1) %_rexxclassdir %{_datadir}/ooRexx -%_rexxlibdir %{_libdir}/ooRexx +%_rexxlibdir %{_libdir} EOF cat > %{name}.pc << EOF @@ -166,6 +180,12 @@ #****************************************************************************** make DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir} mandir=%{_mandir} pkgdatadir=%{_datadir}/ooRexx install +# Move systemd file to the right path +%if 0%{?suse_version} > 1230 +install -D -m644 %{buildroot}%{_datadir}/ooRexx/rxapid.service %{buildroot}%{_unitdir}/%{name}.service +rm -f %{buildroot}%{_datadir}/ooRexx/rxapid.service +%endif + # REXX system-wide RPM macros mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rpm install -m 644 rpmmacros.rexx $RPM_BUILD_ROOT/%{_sysconfdir}/rpm/macros.rexx @@ -178,24 +198,30 @@ cd $RPM_BUILD_ROOT/%{_bindir} ln -sf %{_datadir}/ooRexx/rexxtry.rex . -mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d -echo %{_libdir}/ooRexx > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/ooRexx.conf -chmod 0644 $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/ooRexx.conf - mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d -cd $RPM_BUILD_ROOT/%{_sysconfdir}/init.d -ln -s %{_bindir}/rxapid . +ln -s %{_bindir}/rxapid $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/rxapid # SUSE-style link for the init script -mkdir $RPM_BUILD_ROOT/sbin -cd $RPM_BUILD_ROOT/sbin -ln -s /%{_sysconfdir}/init.d/rxapid rcrxapid +mkdir $RPM_BUILD_ROOT/%{_sbindir} +ln -s /%{_sysconfdir}/init.d/rxapid $RPM_BUILD_ROOT/%{_sbindir}/rcrxapid -# Fix EOL in classes if needed -for f in $RPM_BUILD_ROOT/%{_datadir}/ooRexx/*cls; do +# 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 + #****************************************************************************** %clean #****************************************************************************** @@ -206,12 +232,10 @@ #****************************************************************************** %defattr(-,root,root,-) %doc -%dir %{_libdir}/ooRexx %dir %{_datadir}/ooRexx -%config %{_sysconfdir}/ld.so.conf.d/ooRexx.conf %config %{_sysconfdir}/rpm/macros.rexx %{_sysconfdir}/init.d/rxapid -/sbin/rcrxapid +%{_sbindir}/rcrxapid %{_bindir}/rexx %{_bindir}/rexxc %{_bindir}/rxapi @@ -229,30 +253,24 @@ %{_datadir}/ooRexx/streamsocket.cls %{_datadir}/ooRexx/mime.cls %{_datadir}/ooRexx/smtp.cls -%{_libdir}/ooRexx/librexx.so -%{_libdir}/ooRexx/librexx.so.4 -%{_libdir}/ooRexx/librexx.so.%{orx_libversion} -%{_libdir}/ooRexx/librexxapi.so -%{_libdir}/ooRexx/librexxapi.so.4 -%{_libdir}/ooRexx/librexxapi.so.%{orx_libversion} -%{_libdir}/ooRexx/librxsock.so -%{_libdir}/ooRexx/librxsock.so.4 -%{_libdir}/ooRexx/librxsock.so.%{orx_libversion} -%{_libdir}/ooRexx/librxmath.so -%{_libdir}/ooRexx/librxmath.so.4 -%{_libdir}/ooRexx/librxmath.so.%{orx_libversion} -%{_libdir}/ooRexx/librxregexp.so -%{_libdir}/ooRexx/librxregexp.so.4 -%{_libdir}/ooRexx/librxregexp.so.%{orx_libversion} -%{_libdir}/ooRexx/librexxutil.so -%{_libdir}/ooRexx/librexxutil.so.4 -%{_libdir}/ooRexx/librexxutil.so.%{orx_libversion} -%{_libdir}/ooRexx/libhostemu.so -%{_libdir}/ooRexx/libhostemu.so.4 -%{_libdir}/ooRexx/libhostemu.so.%{orx_libversion} -%{_libdir}/ooRexx/librxunixsys.so -%{_libdir}/ooRexx/librxunixsys.so.4 -%{_libdir}/ooRexx/librxunixsys.so.%{orx_libversion} + +%{_libdir}/librexx.so.4 +%{_libdir}/librexx.so.%{orx_libversion} +%{_libdir}/librexxapi.so.4 +%{_libdir}/librexxapi.so.%{orx_libversion} +%{_libdir}/librxsock.so.4 +%{_libdir}/librxsock.so.%{orx_libversion} +%{_libdir}/librxmath.so.4 +%{_libdir}/librxmath.so.%{orx_libversion} +%{_libdir}/librxregexp.so.4 +%{_libdir}/librxregexp.so.%{orx_libversion} +%{_libdir}/librexxutil.so.4 +%{_libdir}/librexxutil.so.%{orx_libversion} +%{_libdir}/libhostemu.so.4 +%{_libdir}/libhostemu.so.%{orx_libversion} +%{_libdir}/librxunixsys.so.4 +%{_libdir}/librxunixsys.so.%{orx_libversion} + %{_mandir}/man1/rexx.1.gz %{_mandir}/man1/rexxc.1.gz %{_mandir}/man1/rxsubcom.1.gz @@ -262,6 +280,12 @@ %{_datadir}/ooRexx/*.rex %{_datadir}/ooRexx/readme +%if 0%{?suse_version} > 1230 +%{_unitdir}/%{name}.service +%else +%{_datadir}/ooRexx/rxapid.service +%endif + #****************************************************************************** %files devel @@ -275,20 +299,28 @@ %{_includedir}/rexxplatformdefs.h %{_includedir}/oorexxapi.h %{_includedir}/oorexxerrors.h -%{_libdir}/ooRexx/librexx.la -%{_libdir}/ooRexx/librexxapi.la -%{_libdir}/ooRexx/librxsock.la -%{_libdir}/ooRexx/librxmath.la -%{_libdir}/ooRexx/librxregexp.la -%{_libdir}/ooRexx/librexxutil.la -%{_libdir}/ooRexx/libhostemu.la -%{_libdir}/ooRexx/librxunixsys.la +%{_libdir}/librexx.la +%{_libdir}/librexxapi.la +%{_libdir}/librxsock.la +%{_libdir}/librxmath.la +%{_libdir}/librxregexp.la +%{_libdir}/librexxutil.la +%{_libdir}/libhostemu.la +%{_libdir}/librxunixsys.la %{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/librexx.so +%{_libdir}/librexxapi.so +%{_libdir}/librxsock.so +%{_libdir}/librxmath.so +%{_libdir}/librxregexp.so +%{_libdir}/librexxutil.so +%{_libdir}/libhostemu.so +%{_libdir}/librxunixsys.so + %post # Add the rxapi service %fillup_and_insserv rxapid - ldconfig exit 0 @@ -299,7 +331,8 @@ #****************************************************************************** %restart_on_update rxapid %insserv_cleanup +ldconfig +exit 0 #****************************************************************************** - %changelog ++++++ ooRexx-4.1.3.tar.bz2 -> ooRexx-4.2.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/ooRexx/ooRexx-4.1.3.tar.bz2 /work/SRC/openSUSE:Factory/.ooRexx.new/ooRexx-4.2.0.tar.bz2 differ: char 11, line 1 ++++++ ooRexx-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.rgrTcq/_old 2014-10-11 19:27:16.000000000 +0200 +++ /var/tmp/diff_new_pack.rgrTcq/_new 2014-10-11 19:27:16.000000000 +0200 @@ -1,18 +1,3 @@ -# files required for the ooRexx runtime, they are not C sources -addFilter("devel-file-in-non-devel-package.*/usr/lib.*") - -# this is not a script, just a readme -addFilter("script-without-shebang.*/readme.*") - -# these are REXX class files, not standalone scripts. The interpreter looks for them in /usr/bin. Don't ask. -addFilter("script-without-shebang.*/streamsocket.cls.*") -addFilter("script-without-shebang.*/rxftp.cls.*") -addFilter("script-without-shebang.*/socket.cls.*") -addFilter("script-without-shebang.*/smtp.cls.*") -addFilter("script-without-shebang.*/mime.cls.*") -addFilter("script-without-shebang.*/csvStream.cls.*") -addFilter("script-without-shebang.*/rxregexp.cls.*") - # cannot take out the current date from the .so for historical reasons, # as one of the fields returned by the command 'PARSE VERSION' is the # interpreter's build date. ++++++ ooRexx.dsc ++++++ --- /var/tmp/diff_new_pack.rgrTcq/_old 2014-10-11 19:27:16.000000000 +0200 +++ /var/tmp/diff_new_pack.rgrTcq/_new 2014-10-11 19:27:16.000000000 +0200 @@ -1,11 +1,13 @@ -Debtransform-Tar: ooRexx-4.1.3.tar.bz2 +Debtransform-Tar: ooRexx-4.2.0.tar.bz2 +Debtransform-Files-Tar: debian.tar.gz Format: 1.0 Source: oorexx -Version: 4.1.3 +Version: 4.2.0.1 Binary: oorexx Maintainer: Perry Werneck <[email protected]> Architecture: any -Build-Depends: debhelper (>= 7), autotools-dev, autoconf +Build-Depends: debhelper (>= 7), autotools-dev, automake, autoconf, libtool, bison, subversion, coreutils, patch, tofrodos Files: - 00000000000000000000000000000000 000000 ooRexx-4.1.3.tar.gz + 00000000000000000000000000000000 000000 oorexx-4.2.0.tar.bz2 + 00000000000000000000000000000000 000000 debian.tar.gz ++++++ set_default_rexx_path.patch ++++++ --- /var/tmp/diff_new_pack.rgrTcq/_old 2014-10-11 19:27:16.000000000 +0200 +++ /var/tmp/diff_new_pack.rgrTcq/_new 2014-10-11 19:27:16.000000000 +0200 @@ -1,7 +1,7 @@ -diff -Naur ooRexx-4.1.1/interpreter/platform/unix/SysInterpreterInstance.cpp ooRexx-4.1.1/interpreter/platform/unix/SysInterpreterInstance.cpp ---- ooRexx-4.1.1/interpreter/platform/unix/SysInterpreterInstance.cpp 2012-07-18 01:30:52.000000000 -0300 -+++ ooRexx-4.1.1/interpreter/platform/unix/SysInterpreterInstance.cpp 2012-10-23 14:23:49.638038539 -0200 -@@ -102,6 +102,13 @@ +diff -Naur ooRexx-4.2.0/interpreter/platform/unix/SysInterpreterInstance.cpp ooRexx-4.2.0/interpreter/platform/unix/SysInterpreterInstance.cpp +--- ooRexx-4.2.0.original/interpreter/platform/unix/SysInterpreterInstance.cpp 2014-02-24 08:09:32.619362812 -0300 ++++ ooRexx-4.2.0/interpreter/platform/unix/SysInterpreterInstance.cpp 2014-02-24 08:10:33.049257168 -0300 +@@ -124,6 +124,13 @@ size_t parentSize = parentDir == NULL ? 0 : strlen(parentDir); size_t extensionSize = extensionPath == NULL ? 0 : strlen(extensionPath); @@ -15,11 +15,11 @@ // enough room for separators and a terminating null path = (char *)SystemInterpreter::allocateResultMemory(sysPathSize + rexxPathSize + parentSize + extensionSize + 16); - ---- ooRexx-4.1.2/Makefile.am 2012-11-12 11:33:27.064531823 -0200 -+++ ooRexx-4.1.2/Makefile.am 2012-11-12 11:36:21.679707043 -0200 -@@ -155,7 +155,8 @@ - COMMON_CPPFLAGS = -DORX_VER=$(ORX_MAJOR) -DORX_REL=$(ORX_MINOR) -DORX_MOD=$(ORX_MOD_LVL) -DORX_FIX=0 \ +diff -Naur ooRexx-4.2.0/Makefile.am ooRexx-4.2.0/Makefile.am +--- ooRexx-4.2.0.original/Makefile.am 2014-02-24 08:09:32.738358662 -0300 ++++ ooRexx-4.2.0/Makefile.am 2014-02-24 08:12:33.408072613 -0300 +@@ -156,7 +156,8 @@ + -DOOREXX_COPY_YEAR=\"$(ORX_COPY_YEAR)\" \ -DORX_SYS_STR=\"@ORX_SYS_STR@\" \ -DORX_CATDIR=\"$(catdir)\" \ - -DORX_SHARED_LIBRARY_EXT=\"@ORX_SHARED_LIBRARY_EXT@\" @@ -28,7 +28,7 @@ messageXML = $(build_messages_dir)/rexxmsg.xml -@@ -1062,13 +1063,13 @@ +@@ -1086,13 +1087,13 @@ $(install_sh_SCRIPT) rexx.cat $(DESTDIR)$(catdir)/rexx.cat; \ fi $(install_sh_SCRIPT) $(build_os_platform_dir)/oorexx-config $(DESTDIR)$(prefix)/bin/oorexx-config -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
