From 2d16409dbb3cbc0106d3794b8808415a547035a4 Mon Sep 17 00:00:00 2001
From: Martin Gieseking <martin.gieseking@uos.de>
Date: Wed, 20 Mar 2013 16:14:39 +0100
Subject: [PATCH] updated to release 0.30.0
---
icoutils.spec | 34 ++++++++++++++--------------------
1 file changed, 14 insertions(+), 20 deletions(-)
diff --git a/icoutils.spec b/icoutils.spec
index b8c7d22..5b565ad 100644
--- a/icoutils.spec
+++ b/icoutils.spec
@@ -1,6 +1,6 @@
Name: icoutils
-Version: 0.29.1
-Release: 8%{?dist}
+Version: 0.30.0
+Release: 1%{?dist}
Summary: Utility for extracting and converting Microsoft icon and cursor files
Group: Applications/Multimedia
@@ -8,13 +8,9 @@ License: GPLv3+
URL: http://www.nongnu.org/icoutils/
Source0: http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.bz2
-# this patch fixes http://bugzilla.redhat.com/show_bug.cgi?id=701855
-# it has already been applied to the upstream Git repo
-Patch0: %{name}-%{version}-iconsize.patch
+BuildRequires: gettext
+BuildRequires: libpng-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: gettext libpng-devel
Provides: bundled(gnulib)
%description
@@ -25,12 +21,11 @@ libraries.
%prep
%setup -q
-%patch0 -p1
-for f in AUTHORS NEWS; do
- iconv -f ISO88592 -t UTF8 < $f > $f.utf8 && \
- touch -r $f $f.utf8 && \
- mv $f.utf8 $f
+for f in AUTHORS NEWS; do
+ iconv -f ISO88592 -t UTF8 < $f > $f.utf8 && \
+ touch -r $f $f.utf8 && \
+ mv $f.utf8 $f
done
%build
@@ -39,17 +34,11 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
%find_lang %{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files -f %{name}.lang
-%defattr(-,root,root,-)
%doc README AUTHORS COPYING NEWS TODO ChangeLog
%{_bindir}/extresso
%{_bindir}/genresscript
@@ -59,6 +48,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Mar 20 2013 Martin Gieseking <martin.gieseking@uos.de> 0.30.0-1
+- updated to release 0.30.0
+- dropped patch as it has been applied upstream
+- removed old buildroot stuff
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.29.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild