From 14f601e600ef8de13d9a5ef897fcc923cfb2196a Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Sat, 24 Oct 2015 01:59:37 +1000 Subject: [PATCH] Sort patches --- sane.spec | 62 +++++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/sane.spec b/sane.spec index 816c0b5..966d045 100644 --- a/sane.spec +++ b/sane.spec @@ -44,36 +44,36 @@ Source12: http://www.geocities.com/trsh0101/SANE/primascan.c Source13: iscan-%{iscanversion}-3-free.tar.bz2 Source14: http://downloads.sourceforge.net/project/geniusvp2/sane-backend-geniusvp2/1.0.16.1/sane-backend-geniusvp2_1.0.16.1.tar.gz Source15: sane.rpmlintrc -Patch0: sane-backends-1.0.19-fix-str-fmt.patch -Patch1: sane-backends-1.0.18-plustek-s12.patch -Patch23: iscan-2.29.3-fix-link.patch -Patch26: iscan-2.20.1-no_non-free_please.diff -Patch27: iscan-2.28.1-linkage_fix.patch +Patch0: sane-backends-1.0.18-plustek-s12.patch # (fc) 1.0.19-12mdv fix group for device -Patch28: sane-backends-1.0.20-group.patch -# (fc) 1.0.20-1mdv primascan build support -Patch29: sane-backends-1.0.21-primascan.patch +Patch1: sane-backends-1.0.20-group.patch # (fc) list Brother MFC-260C, DCP130C as supported (Mdv bug # 52951) -Patch30: sane-backends-1.0.22-brother2list.patch -Patch31: sane-backends-1.0.20-strformat.patch -Patch33: sane-backends-1.0.23-have-pthread.patch +Patch2: sane-backends-1.0.22-brother2list.patch +Patch3: sane-backends-1.0.20-strformat.patch +Patch4: sane-backends-1.0.23-have-pthread.patch # Debian patches # new build system breaks build when using pthreads. -Patch101: 01_missing_pthreads.dpatch +Patch10: 01_missing_pthreads.dpatch # add back SANE_CAP_ALWAYS_SETTABLE which was mistakenly # removed from SANE 1.0.20 -Patch106: 06_cap_always_settable.dpatch +Patch11: 06_cap_always_settable.dpatch # Use fedora's patch to remove rpath # Patch to the dll backend to look for pieces of dll.conf inside the # /etc/sane.d/dll.d/ directory. This is a facility for packages providing # external backends (like libsane-extras, hpoj and hplip). -Patch113: 22_dll_backend_conf.dpatch -Patch115: 24_sane-desc.c_debian_mods.dpatch +Patch12: 22_dll_backend_conf.dpatch +Patch13: 24_sane-desc.c_debian_mods.dpatch # Fedora patches -Patch202: sane-backends-1.0.20-open-macro.patch -Patch203: sane-backends-1.0.23-udev.patch +Patch20: sane-backends-1.0.20-open-macro.patch +Patch21: sane-backends-1.0.23-udev.patch + +Patch30: iscan-2.29.3-fix-link.patch +Patch31: iscan-2.20.1-no_non-free_please.diff +Patch32: iscan-2.28.1-linkage_fix.patch +# (fc) 1.0.20-1mdv primascan build support +Patch29: sane-backends-1.0.21-primascan.patch BuildRequires: gettext BuildRequires: gettext-devel @@ -263,20 +263,20 @@ systemctl restart xinetd %prep %setup -qn sane-backends-%{version} -%patch1 -p1 -b .plusteks12 -%patch28 -p1 -b .group -%patch30 -p1 -b .brother2list -%patch31 -p1 -b .strformat -%patch33 -p1 -b .pthread +%patch0 -p1 -b .plusteks12 +%patch1 -p1 -b .group +%patch2 -p1 -b .brother2list +%patch3 -p1 -b .strformat +%patch4 -p1 -b .pthread -%patch101 -p1 -%patch106 -p1 -%patch113 -p1 -%patch115 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 # Fedora patches -%patch202 -p1 -b .open-macro -%patch203 -p1 -b .udev +%patch20 -p1 -b .open-macro +%patch21 -p1 -b .udev # Primax parallel port scanners %if %{with primax} @@ -305,9 +305,9 @@ perl -p -i -e 's:for \(retries = 20; retries; retries--\):for (retries = 5; retr %if %{with epkowa} pushd iscan-%{iscanversion} -%patch23 -p0 -b .iscan-2.10.0-1_fix_link -%patch26 -p0 -b .no_non-free_please -%patch27 -p2 -b .linkage_fix +%patch30 -p0 -b .iscan-2.10.0-1_fix_link +%patch31 -p0 -b .no_non-free_please +%patch32 -p2 -b .linkage_fix popd %endif