rpms/sane-backends
7
0
Fork 0
Code Issues Pull Requests Releases Activity

drop acinclude patch to not unnecessarily rebuild autoconf/libtool files

Browse Source 
which made libtool break builds on Rawhide use "make DESTDIR=...
    install" instead of "%makeinstall"
This commit is contained in:
Nils Philippsen 2009-02-25 11:30:35 +00:00
parent 5f4d21309a
commit 601b8ba55d
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
sane-backends-1.0.19-acinclude.patch.bz2
View File

Binary file not shown.

37
sane-backends.spec
View File

@ -1,7 +1,7 @@
Summary: Scanner access software Summary: Scanner access software
Name: sane-backends Name: sane-backends
Version: 1.0.19 Version: 1.0.19
Release: 12%{?dist} Release: 13%{?dist}
# lib/ is LGPLv2+, backends are GPLv2+ with exceptions # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
# Tools are GPLv2+, docs are public domain # Tools are GPLv2+, docs are public domain
# see LICENSE for details # see LICENSE for details
@ -10,12 +10,11 @@ Group: System Environment/Libraries
Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
Source1: sane.png Source1: sane.png
Source2: hal-usb-scanner-add Source2: hal-usb-scanner-add
Patch0: sane-backends-1.0.19-acinclude.patch.bz2 Patch0: sane-backends-1.0.18-rpath.patch
Patch1: sane-backends-1.0.18-rpath.patch Patch1: sane-backends-1.0.19-pkgconfig.patch
Patch2: sane-backends-1.0.19-pkgconfig.patch Patch2: sane-backends-1.0.19-glibc-2.7.patch
Patch3: sane-backends-1.0.19-glibc-2.7.patch Patch3: sane-backends-1.0.19-policykit.patch
Patch4: sane-backends-1.0.19-policykit.patch Patch4: sane-backends-1.0.19-uninitialized.patch
Patch5: sane-backends-1.0.19-uninitialized.patch
URL: http://www.sane-project.org URL: http://www.sane-project.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
BuildRequires: tetex-latex BuildRequires: tetex-latex
@ -23,9 +22,6 @@ BuildRequires: libusb-devel
BuildRequires: libieee1284-devel BuildRequires: libieee1284-devel
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
BuildRequires: autoconf
BuildRequires: libtool
BuildRequires: gettext
BuildRequires: gphoto2-devel BuildRequires: gphoto2-devel
Requires: pam >= 0.78-2 Requires: pam >= 0.78-2
Requires: hal >= 0.4.0 Requires: hal >= 0.4.0
@ -78,21 +74,17 @@ want to access digital cameras.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .acinclude %patch0 -p1 -b .rpath
%patch1 -p1 -b .rpath %patch1 -p1 -b .pkgconfig
%patch2 -p1 -b .pkgconfig %patch2 -p1 -b .glibc-2.7
%patch3 -p1 -b .glibc-2.7 %patch3 -p1 -b .policykit
%patch4 -p1 -b .policykit %patch4 -p1 -b .uninitialized
%patch5 -p1 -b .uninitialized
for i in agfafocus avision coolscan2 umax_pp; do for i in agfafocus avision coolscan2 umax_pp; do
iconv -f iso-8859-1 -t utf-8 < "doc/sane-$i.man" > "doc/sane-$i.man_" iconv -f iso-8859-1 -t utf-8 < "doc/sane-$i.man" > "doc/sane-$i.man_"
mv "doc/sane-$i.man_" "doc/sane-$i.man" mv "doc/sane-$i.man_" "doc/sane-$i.man"
done done
# We patched configure.in, so regenerate configure.
autoreconf --install --force
%build %build
%configure \ %configure \
--with-gphoto2=%{_prefix} \ --with-gphoto2=%{_prefix} \
@ -102,7 +94,7 @@ make %{?_smp_mflags}
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
%{makeinstall} docdir=%{buildroot}/%{_docdir}/%{name}-%{version} make DESTDIR="%{buildroot}" install
mkdir -p %{buildroot}%{_datadir}/pixmaps mkdir -p %{buildroot}%{_datadir}/pixmaps
install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps
@ -162,6 +154,11 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/sane-backends.pc %{_libdir}/pkgconfig/sane-backends.pc
%changelog %changelog
* Wed Feb 25 2009 Nils Philippsen <nils@redhat.com> - 1.0.19-13
- drop acinclude patch to not unnecessarily rebuild autoconf/libtool files
which made libtool break builds on Rawhide
- use "make DESTDIR=... install" instead of "%%makeinstall"
* Thu Sep 4 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.0.19-12 * Thu Sep 4 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.0.19-12
- fix license tag - fix license tag