Hello community, here is the log from the commit of package pdftk for openSUSE:Factory checked in at 2012-06-07 15:39:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pdftk (Old) and /work/SRC/openSUSE:Factory/.pdftk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pdftk", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/pdftk/pdftk.changes 2012-06-01 07:22:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pdftk.new/pdftk.changes 2012-06-07 15:39:25.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Jun 4 08:00:04 UTC 2012 - [email protected] + +- remove specfile hacks to find out current gcj version + +------------------------------------------------------------------- +Sat May 26 06:25:22 UTC 2012 - [email protected] + +- do not set LIBGCJ but instead require java-<VER>-gcj-compat + this avoids lots of specfile hacks to define current gcj version + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pdftk.spec ++++++ --- /var/tmp/diff_new_pack.V3hm4i/_old 2012-06-07 15:39:26.000000000 +0200 +++ /var/tmp/diff_new_pack.V3hm4i/_new 2012-06-07 15:39:26.000000000 +0200 @@ -30,33 +30,17 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: unzip +# not sure when 1_5_0 was introduced, just guessing +%if 0%{?suse_version} >= 1100 +BuildRequires: java-1_5_0-gcj-compat +%else +BuildRequires: java-1_4_2-gcj-compat +%endif + # BuildRequires package version suffix : "41" for "gcc41-java" %define pkgv %nil # gcc/gcj binaries version suffix : "-4.1" for "gcj-4.1" %define gxxv %nil -# ligcj.jar version suffix : "-4.1" for "/usr/share/java/libgcj-4.1.jar" -%define jarv %nil - -# this is really stupid, there must be a better way to do this... -%if 0%{?suse_version} > 1210 -%define jarv -4.7 -%endif - -%if 0%{?suse_version} <= 1210 -%define jarv -4.6 -%endif - -%if 0%{?suse_version} <= 1140 -%define jarv -4.5 -%endif - -%if 0%{?suse_version} <= 1120 -%define jarv -4.4 -%endif - -%if 0%{?suse_version} <= 1110 -%define jarv -4.3 -%endif # openSUSE 11.0 and SLE_11 are odd cases. # %jarv is still correct from above for both @@ -67,18 +51,6 @@ %define gxxv -4.3 %endif -%if 0%{?suse_version} == 1020 -%define jarv -4.1.2 -%endif - -%if 0%{?suse_version} == 1010 -%define jarv -4.1.0 -%endif - -%if 0%{?suse_version} == 1000 -%define jarv -4.0.2 -%endif - BuildRequires: gcc%{pkgv}-c++ BuildRequires: gcc%{pkgv}-java BuildRequires: libgcj%{pkgv} @@ -117,7 +89,7 @@ %__sed -i 's/\r$//' changelog.txt license_gpl_pdftk/*.txt license_gpl_pdftk/*/*.txt %build -%__make -C pdftk CXXFLAGS="%optflags" LIBGCJ=%{_javadir}/libgcj%{jarv}.jar GXXV=%gxxv +%__make -C pdftk CXXFLAGS="%optflags" LIBGCJ= GXXV=%gxxv %__strip pdftk/%name %install -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
