Packman Build Service PMBS

iscan.spec Changed

@@ -33,6 +33,7 @@
 Patch1:         jpegstream.patch
 # PATCH-FIX-UPSTREAM -- https://bugs.gentoo.org/692708
 Patch2:         iscan-2.30.4.2-sscanf.patch
+Patch3:         iscan-data.patch
 BuildRequires:  gcc-c++
 BuildRequires:  gettext-tools
 BuildRequires:  libjpeg-devel
@@ -47,9 +48,8 @@
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(sane-backends)
 BuildRequires:  pkgconfig(udev)
-Requires:       %{name}-data
+Requires:       %{name}-data = %version-%release
 Requires(post): systemd
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:	x86_64
 
 %description
@@ -78,21 +78,17 @@
 Image Scan! for Linux will not function without this package.
 
 %prep
-%setup -q
-%setup -q -D -T -a 1
-
-%patch0
-%patch1 -p2
-%patch2 -p1
+%autosetup -p1 -a 1
 
+%build
 # Fix for CXX ABI different than 1002 (export from arch)
 ln -s libesmod-x86_64.c2.so non-free/libesmod-x86_64.so
 
-%build
-# Build iscan
-export CFLAGS="$(echo %optflags | sed 's/\-fstack-clash-protection//')"
-export CXXFLAGS="${CFLAGS}"
-export LDFLAGS="${LDFLAGS} -ldl -lpng16"
+find -name Makefile.in -print -delete
+autoreconf -vif
+CFLAGS='%optflags -Wno-deprecated-declarations'
+CXXFLAGS="${CFLAGS}"
+LDFLAGS="${LDFLAGS} -ldl -lpng16"
 %configure \
   --sbindir=%{_bindir} \
   --enable-dependency-reduction \
@@ -102,34 +98,36 @@
   --enable-png \
   --enable-gimp \
   --enable-static=no
-
-make  %{?_smp_mflags}
+%make_build
 
 # Build data
-cd %{name}-data-%{version_iscan_data}
+pushd %{name}-data-%{version_iscan_data}
+autoreconf -vif
 %configure --libdir="%{_prefix}/lib"
-make  %{?_smp_mflags}
-make %{?_smp_mflags} %{name}-data.hwdb
+%make_build
+%make_build %{name}-data.hwdb
+popd
 
 %install
-# iscan: install files
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 install -d %{buildroot}%{plugindir}/plug-ins
-ln -s %{_bindir}/iscan %{buildroot}%{_libdir}/gimp/2.0/plug-ins/iscan
+gimplibdir="`pkg-config --variable=gimplibdir gimp-2.0`"
+mkdir -vp %{buildroot}${gimplibdir}/plug-ins
+ln -s %{_bindir}/iscan %{buildroot}${gimplibdir}/plug-ins/iscan
 install -D -m 0644 backend/epkowa.conf %{buildroot}%{_sysconfdir}/sane.d/epkowa.conf
 install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sane.d/dll.d/epkowa.conf
 
-find %{buildroot} $ -name \*.la -o -name \*.so  $ -exec rm {} \;
+find %{buildroot} $ -name \*.la -o -name \*.so $ -ls -delete
 
 %suse_update_desktop_file -i %{name} Graphics Scanning
 
 %find_lang %{name}
 
 # data: install files
-cd %{name}-data-%{version_iscan_data}
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
-
+pushd %{name}-data-%{version_iscan_data}
+%make_install
 install -D -m 0644 %{name}-data.hwdb %{buildroot}/%{_udevhwdbdir}/%{name}-data.hwdb
+popd
 
 %post
 /sbin/ldconfig
@@ -143,8 +141,9 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc NEWS README AUTHORS COPYING
-%doc non-free/COPYING.EPSON.en.txt
+%doc NEWS README AUTHORS
+%license COPYING
+%license non-free/COPYING.EPSON.en.txt
 %doc doc/xinetd.sane
 %dir %{_sysconfdir}/sane.d
 %dir %{_sysconfdir}/sane.d/dll.d
@@ -154,15 +153,14 @@
 %{_bindir}/%{name}-registry
 %{_libdir}/libesmod.so*
 %{_libdir}/sane/libsane-epkowa.so*
-%{_libdir}/gimp/2.0/plug-ins/iscan
+%{_libdir}/gimp
 %{_datadir}/applications/%{name}.desktop
 %{_mandir}/man?/iscan.?.gz
 %{_mandir}/man?/sane-epkowa.?.gz
 %{_mandir}/man?/iscan-registry.?.gz
 
 %files data
-%defattr(-, root, root)
-%doc %{name}-data-%{version_iscan_data}/COPYING
+%license %{name}-data-%{version_iscan_data}/COPYING
 %doc %{name}-data-%{version_iscan_data}/NEWS
 %doc %{name}-data-%{version_iscan_data}/KNOWN-PROBLEMS
 %doc %{name}-data-%{version_iscan_data}/SUPPORTED-DEVICES

iscan-2.30.4.2-sscanf.patch Changed

iscan-data.patch Added

jpegstream.patch Changed

libpng15.patch Changed

@@ -1,6 +1,6 @@
---- lib/pngstream.cc	2011-12-01 02:30:53.000000000 +0100
-+++ lib/pngstream.cc	2012-02-06 03:06:22.000000000 +0100
-@@ -83,7 +83,12 @@
+--- a/lib/pngstream.cc
++++ b/lib/pngstream.cc
+@@ -83,7 +83,12 @@ namespace iscan
  #if HAVE_PNG_H
      set_error_handler (_png, _info);
  
@@ -13,7 +13,7 @@
        {
          lib->write_end (_png, _info);
          _footer = true;
-@@ -167,6 +172,9 @@
+@@ -157,6 +162,9 @@ namespace iscan
      funcsym (write_row);
      funcsym (write_flush);
      funcsym (write_end);
@@ -23,7 +23,7 @@
  
      if (lib->access_version_number
          && lib->create_write_struct
-@@ -176,6 +184,9 @@
+@@ -166,6 +174,9 @@ namespace iscan
          && lib->set_IHDR
          && lib->set_pHYs
          && lib->set_invert_mono
@@ -33,9 +33,9 @@
          && lib->write_info
          && lib->write_row
          && lib->write_flush
---- lib/pngstream.hh	2011-12-01 02:30:53.000000000 +0100
-+++ lib/pngstream.hh	2012-02-06 03:09:09.000000000 +0100
-@@ -108,6 +108,10 @@
+--- a/lib/pngstream.hh
++++ b/lib/pngstream.hh
+@@ -108,6 +108,10 @@ namespace iscan
                 png_structp);
        fundecl (void, write_end,
                 png_structp, png_infop);

Changes of Revision 2