[simple-scan] Clean up spec file

Simone Caronni slaanesh at fedoraproject.org
Mon Mar 10 11:39:28 UTC 2014


commit 901948b57052eea942d3ba33de1576900a9d5a12
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Mar 10 12:39:12 2014 +0100

    Clean up spec file

 simple-scan.spec |   85 +++++++++++++----------------------------------------
 1 files changed, 21 insertions(+), 64 deletions(-)
---
diff --git a/simple-scan.spec b/simple-scan.spec
index b590364..7dced47 100644
--- a/simple-scan.spec
+++ b/simple-scan.spec
@@ -3,23 +3,22 @@ Version:        3.11.91
 Release:        1%{?dist}
 Summary:        Simple scanning utility
 
-Group:          Applications/Multimedia
 License:        GPLv3+
-URL:            https://launchpad.net/simple-scan
-Source0:        https://launchpad.net/simple-scan/3.11/%{version}/+download/simple-scan-%{version}.tar.xz
-
-BuildRequires: intltool
-BuildRequires: sane-backends-devel
-BuildRequires: itstool
-BuildRequires: pkgconfig(colord)
-BuildRequires: pkgconfig(gtk+-3.0)
-BuildRequires: pkgconfig(gudev-1.0)
-BuildRequires: pkgconfig(sqlite3)
-BuildRequires: pkgconfig(zlib)
-
-Requires: gnome-icon-theme
-Requires: xdg-utils
-Requires: yelp
+URL:            https://launchpad.net/%{name}
+Source0:        https://launchpad.net/%{name}/3.10/%{version}/+download/%{name}-%{version}.tar.xz
+
+BuildRequires:  intltool
+BuildRequires:  sane-backends-devel
+BuildRequires:  itstool
+BuildRequires:  pkgconfig(colord)
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(gudev-1.0)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(zlib)
+
+Requires:       gnome-icon-theme
+Requires:       xdg-utils
+Requires:       yelp
 
 %description
 Simple Scan is an easy-to-use application, designed to let users connect their
@@ -29,17 +28,16 @@ scanner and quickly have the image/document in an appropriate format.
 %setup -q
 
 %build
-
 %configure
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 %find_lang %{name} --with-man --with-gnome
 
 %postun
 if [ $1 -eq 0 ]; then
-  glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+    glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 fi
 
 %posttrans
@@ -47,11 +45,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %files -f %{name}.lang
 %doc COPYING NEWS README.md
-%{_mandir}/man1/simple-scan.1.gz
-%{_bindir}/simple-scan
+%{_mandir}/man1/%{name}.1.gz
+%{_bindir}/%{name}
 %{_datadir}/appdata/
-%{_datadir}/applications/simple-scan.desktop
-%{_datadir}/simple-scan/
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/%{name}/
 %{_datadir}/glib-2.0/schemas/org.gnome.SimpleScan.gschema.xml
 
 %changelog
@@ -116,44 +114,3 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 * Mon Jul 25 2011 Matthias Clasen <mclasen at redhat.com> - 3.1.3-1
 - Update to 3.1.3
-
-* Tue Apr 26 2011 Matthias Clasen <mclasen at redhat.com> - 2.32.0.2-1
-- Update to 2.32.0.2
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.32.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Thu Nov 11 2010 Matthias Clasen <mclasen at redhat.com> - 2.32.0.1-1
-- Update to 2.32.0.1
-
-* Tue Aug 31 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.91-1
-- Update to 2.31.91
-
-* Tue Aug 17 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.90.2-1
-- Update to 2.31.90.2
-
-* Mon Aug 16 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.90.1-1
-- Update to 2.31.90.1
-- Use GConf macros
-
-* Tue Jul 13 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.5-1
-- Update to 2.31.5
-
-* Wed Jun 30 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.4-1
-- Update to 2.31.4
-
-* Mon Jun  7 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.3-1
-- Update to 2.31.3
-
-* Thu May 27 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.1-1
-- Update to 2.31.1
-
-* Wed Mar 17 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 0.9.9-1
-- https://launchpad.net/simple-scan/trunk/0.9.9
-
-* Mon Mar 08 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 0.9.5-2
-- Organize and comment patch dependencies and link to upstream bug report 
-- add requires on yelp and add gconf schema scriptlets 
-
-* Fri Mar 05 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 0.9.5-1
-- initial build


More information about the scm-commits mailing list