commit pdftk for openSUSE:Factory
Hello community, here is the log from the commit of package pdftk for openSUSE:Factory checked in at 2012-06-01 07:22:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pdftk (Old) and /work/SRC/openSUSE:Factory/.pdftk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pdftk", Maintainer is "Thomas.Schraitle@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/pdftk/pdftk.changes 2011-09-23 12:21:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pdftk.new/pdftk.changes 2012-06-01 07:22:18.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 24 07:55:59 UTC 2012 - seife+obs@b1-systems.com + +- fix build for Factory's gcc-4.7 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pdftk.spec ++++++ --- /var/tmp/diff_new_pack.56tln0/_old 2012-06-01 07:22:19.000000000 +0200 +++ /var/tmp/diff_new_pack.56tln0/_new 2012-06-01 07:22:19.000000000 +0200 @@ -1,7 +1,8 @@ # # spec file for package pdftk # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 B1 Systems GmbH, Vohburg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,18 +17,16 @@ # - Name: pdftk Version: 1.44 -Release: 3 -License: GPL-2.0+ +Release: 0 Summary: A handy tool for manipulating PDF -Url: http://www.pdflabs.com/ +License: GPL-2.0+ Group: Productivity/Publishing/PDF +Url: http://www.pdflabs.com/ Source0: %{name}-%{version}-src.zip Source1: Makefile.SUSE Patch0: bug-427046_pdftk.cc.patch -AutoReqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: unzip @@ -38,7 +37,12 @@ # ligcj.jar version suffix : "-4.1" for "/usr/share/java/libgcj-4.1.jar" %define jarv %nil -%if 0%{?suse_version} > 1140 +# 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 @@ -75,7 +79,10 @@ %define jarv -4.0.2 %endif -BuildRequires: gcc%{pkgv}-c++ gcc%{pkgv}-java libgcj%{pkgv} libgcj%{pkgv}-devel +BuildRequires: gcc%{pkgv}-c++ +BuildRequires: gcc%{pkgv}-java +BuildRequires: libgcj%{pkgv} +BuildRequires: libgcj%{pkgv}-devel %if 0%{?suse_version} > 1010 || 0%{?sles_version} == 10 BuildRequires: fastjar -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de