Packman Build Service PMBS

Changes of Revision 9

pdftk.spec Changed

@@ -28,30 +28,20 @@
 Source0:        %{name}-%{version}-src.zip
 Source1:        Makefile.SUSE
 Patch0:         bug-427046_pdftk.cc.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  unzip
-
-# There is a stack of fall-through logic from here to %%description.
-# Be careful inserting stuff in here as order matters.
-
-# 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
-
 %if 0%{?suse_version} > 1320
 # gcc7 no longer has gcj!
 %define pkgv 6
 %define gxxv -6
-BuildRequires:  pkgconfig(libgcj-6)
+BuildRequires:  pkgconfig(libgcj-%{pkgv})
 %else
-BuildRequires:  libgcj48-devel
+%define pkgv 48
+%define gxxv -4.8
 %endif
-
 BuildRequires:  gcc%{pkgv}-c++
 BuildRequires:  gcc%{pkgv}-java
 BuildRequires:  java-gcj
 BuildRequires:  fastjar
+BuildRequires:  unzip
 
 %description
 If PDF is electronic paper, then pdftk is an electronic staple-remover,
@@ -78,26 +68,23 @@
 %prep
 %setup -q -n %{name}-%{version}-dist
 %patch0 -p0
-%__cp %{S:1} pdftk/Makefile
-%__sed -i 's/\r$//' changelog.txt license_gpl_pdftk/*.txt license_gpl_pdftk/*/*.txt
-%__chmod 644 changelog.txt license_gpl_pdftk/*.txt license_gpl_pdftk/*/*.txt
-
 %build
+cp %{S:1} pdftk/Makefile
+sed -i 's/\r$//' changelog.txt license_gpl_pdftk/*.txt license_gpl_pdftk/*/*.txt
+chmod 644 changelog.txt license_gpl_pdftk/*.txt license_gpl_pdftk/*/*.txt
+
 ## gcc-6 does not know -fstack-clash-protection
 OPTFLAGS="`echo %optflags| sed 's/-fstack-clash-protection//'`"
-%__make -C pdftk CXXFLAGS="$OPTFLAGS" GCJFLAGS="$(echo " $OPTFLAGS" | sed 's/ -D/ -Wp,-D/g')" VERSUFF=%gxxv
+make -C pdftk CXXFLAGS="$OPTFLAGS" GCJFLAGS="$(echo " $OPTFLAGS" | sed 's/ -D/ -Wp,-D/g')" VERSUFF=%gxxv
 
 %install
-%__install -Dm 0755 pdftk/%name %{buildroot}%{_bindir}/%name
-%__install -Dpm 0644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
-
-%clean
-%__rm -rf %buildroot
+install -Dm 0755 pdftk/%name %{buildroot}%{_bindir}/%name
+install -Dpm 0644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
 
 %files
-%defattr(-,root,root)
 %{_bindir}/%name
 %{_mandir}/man1/%{name}.*
-%doc changelog.txt license_gpl_pdftk/*.txt license_gpl_pdftk/*/*.txt
+%doc changelog.txt
+%license license_gpl_pdftk/*.txt license_gpl_pdftk/*/*.txt
 
 %changelog