[intltool] Clean up previous change and fix Requires/BuildRequires (#225902)

Kalev Lember kalev at fedoraproject.org
Mon Apr 16 22:44:57 UTC 2012


commit b813c08aef46049d492bdc4e8c631ac789cebf2b
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Mon Apr 16 22:43:51 2012 +0300

    Clean up previous change and fix Requires/BuildRequires (#225902)

 intltool.spec |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/intltool.spec b/intltool.spec
index c7876b3..498be61 100644
--- a/intltool.spec
+++ b/intltool.spec
@@ -4,7 +4,7 @@
 Name: intltool
 Summary: Utility for internationalizing various kinds of data files
 Version: 0.50.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 with exceptions
 Group: Development/Tools
 #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk
@@ -14,12 +14,10 @@ BuildArch: noarch
 Requires: patch
 # for /usr/share/aclocal
 Requires: automake
-Requires: gettext
-#Obsoletes: xml-i18n-tools
-#Provides: xml-i18n-tools = 0.11
+Requires: gettext-devel
 Requires: perl(XML::Parser)
 BuildRequires: perl(XML::Parser)
-BuildRequires: gettext-devel
+BuildRequires: gettext
 # http://bugzilla.gnome.org/show_bug.cgi?id=568845
 # Dropping this patch per the last comment on that thread:
 # Martin Pitt: As the reporter of the bug I close this, as the new API du jour is gsettings,
@@ -40,18 +38,12 @@ them in the po files.
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %check
 make check
 
 %files
-%defattr(-,root,root)
 %doc AUTHORS COPYING README
 %{_bindir}/*
 %{_datadir}/intltool
@@ -59,6 +51,9 @@ make check
 %{_mandir}/man*/*
 
 %changelog
+* Tue Apr 17 2012 Kalev Lember <kalevlember at gmail.com> - 0.50.2-2
+- Clean up previous change and fix Requires/BuildRequires (#225902)
+
 * Fri Apr 06 2012 Jon Ciesla <limburgher at gmail.com> - 0.50.2-1
 - Latest stable release.
 - Merge review BZ 225902 fixes:


More information about the scm-commits mailing list