rpms/grip/devel grip.spec,1.1,1.2

[Adrian Reber (adrian)]

Author: adrian

Update of /cvs/extras/rpms/grip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5199

Modified Files:
	grip.spec 
Log Message:
first try to make grip.spec compliant with the package guidelines



Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/devel/grip.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grip.spec	2 Mar 2005 08:48:40 -0000	1.1
+++ grip.spec	2 Mar 2005 09:22:01 -0000	1.2
@@ -1,23 +1,19 @@
-Summary: A front-end for CD rippers and Ogg Vorbis encoders.
+Summary: A front-end for CD rippers and Ogg Vorbis encoders
 Name: grip
 Version: 3.2.0
-Release: 3
-Serial: 1
-Copyright: GPL
+Release: 4
+Epoch: 1
+License: GPL
 Group: Applications/Multimedia
-Source: http://www.nostatic/grip/%{name}-%{version}.tar.gz
-Source1: gripicon.png
-Source2: grip.desktop
+Source: http://www.nostatic/grip/grip-%{version}.tar.gz
 Patch1: grip-3.2.0-default.patch
-Patch2: grip-3.0.7-cdparanoia.patch
-Patch3: grip-3.0.7-locking.patch
-Patch4: grip-3.2.0-rh1.patch
-URL: http://www.nostatic.org/grip
-Buildroot: %{_tmppath}/%{name}-root
+URL: http://www.nostatic.org/grip/
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: vorbis-tools
-BuildPrereq: vte-devel cdparanoia-devel autoconf >= 2.52
-BuildPrereq: libgnomeui-devel, curl-devel, desktop-file-utils
-ExcludeArch: s390 s390x
+BuildRequires: vte-devel cdparanoia-devel
+BuildRequires: libgnomeui-devel curl-devel
+BuildRequires: gettext id3lib-devel
+BuildRequires: desktop-file-utils
 
 %description
 Grip is a GTK+ based front-end for CD rippers (such as cdparanoia and
@@ -28,51 +24,66 @@
 %prep
 %setup -q
 %patch1 -p1 -b .rh-default-encoder
-#%patch2 -p1 -b .cdparanoia
-#%patch3 -p1 -b .locking
-%patch4 -p1 -b .rh1
-
 
 %build
-autoconf
 %configure
-make
+%{__make} %{_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-cp -f %{SOURCE2} .
+rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 make DESTDIR=$RPM_BUILD_ROOT install-am
 
-install $RPM_SOURCE_DIR/gripicon.png %{buildroot}%{_datadir}/pixmaps
+cat >> %{buildroot}%{_datadir}/applications/grip.desktop << EOF
+StartupWMClass=Grip
+Encoding=UTF-8
+EOF
+iconv -f ISO-8859-1 -t UTF-8 \
+	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop > \
+	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop.new
+
+mv	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop.new \
+	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop
 
 desktop-file-install \
-	--vendor=net \
+	--vendor=fedora \
 	--dir $RPM_BUILD_ROOT/%{_datadir}/applications \
 	--delete-original \
-	--add-category X-Red-Hat-Extra \
+	--add-category X-Fedora \
 	--add-category Application \
 	--add-category AudioVideo \
-	%{buildroot}%{_datadir}/gnome/apps/Multimedia/grip.desktop
-cat >> %{buildroot}%{_datadir}/applications/net-grip.desktop << EOF
-StartupWMClass=Grip
-EOF
+	$RPM_BUILD_ROOT%{_datadir}/applications/grip.desktop
 %find_lang %{name}-2.2
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %files -f %{name}-2.2.lang
 %defattr(-,root,root)
-%doc README ChangeLog CREDITS COPYING INSTALL NEWS AUTHORS TODO
+%doc README ChangeLog CREDITS COPYING AUTHORS TODO
 %{_bindir}/grip
 %{_datadir}/pixmaps/gripicon.png
 %{_datadir}/gnome/help/grip
 %{_datadir}/applications/*
 
 %changelog
+* Wed Mar 02 2005 Adrian Reber <adrian at lisas.de> - 1:3.2.0-4
+- s/Copyright/License/
+- s/Serial/Epoch/
+- cosmetic changes to quiet rpmlint
+- removed grip.png and grip.desktop (Source1 and Source2) as
+  it is already included in the tarball
+- removed unused patches
+- removed ExcludeArch: s390 s390x
+- renamed BuildPrereq to BuildRequires
+- added id3lib-devel to BuildRequires
+- use %%{_smp_mflags}
+- changed .desktop file creation and installation
+- removed INSTALL and NEWS from %%doc
+- delete changelog entries older than 2004
+
 * Fri Oct  8 2004 Bill Nottingham <notting at redhat.com> 3.2.0-3
 - add a passel of buildreqs (#135045)
 
@@ -89,112 +100,3 @@
 
 * Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
 - rebuilt
-
-* Mon Aug 18 2003 Bill Nottingham <notting at redhat.com> 1:3.0.7-3
-- fix it so it actually uses cdparanoia libraries
-- close the cd device before ripping so locking works (#102051)
-
-* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Thu May 29 2003 Bill Nottingham <notting at redhat.com> 1:3.0.7-1
-- update to 3.0.7
-
-* Tue Feb 18 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-5
-- fix default encoder (#83647)
-
-* Wed Feb  5 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-4
-- desktop file fixing
-
-* Wed Jan 29 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-3
-- fix debuginfo-induced desktop file weirdness (#82905)
-
-* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
-- rebuilt
-
-* Tue Jan  7 2003 Bill Nottingham <notting at redhat.com> 1:3.0.4-1
-- update to 3.0.4
-
-* Mon Dec 23 2002 Tim Powers <timp at redhat.com> 1:3.0.1-5
-- bump and rebuild
-
-* Thu Dec 12 2002 Tim Powers <timp at redhat.com> 1:3.0.1-4
-- rebuild on all arches
-
-* Wed Aug 21 2002 Bill Nottingham <notting at redhat.com> 3.0.1-4
-- fix encode options (#72156)
-
-* Mon Aug 19 2002 Bill Nottingham <notting at redhat.com> 3.0.1-3
-- rebuild (#71899)
-
-* Tue Jul 23 2002 Tim Powers <timp at redhat.com> 3.0.1-2
-- build using gcc-3.2-0.1
-
-* Mon Jun 24 2002 Bill Nottingham <notting at redhat.com> 3.0.1-1
-- update to 3.0.1
-
-* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
-- automated rebuild
-
-* Thu May 23 2002 Tim Powers <timp at redhat.com>
-- automated rebuild
-
-* Wed Apr 10 2002 Bill Nottingham <notting at redhat.com>
-- fix default encoder opts (#62551)
-
-* Wed Jul 18 2001 Bill Nottingham <notting at redhat.com>
-- update to 2.96
-
-* Mon May 21 2001 Tim Powers <timp at redhat.com>
-- applied patches from alane at geeksrus.net in bug #41490
-
-* Mon May 14 2001 Tim Powers <timp at redhat.com>
-- updated to 2.95
-- requires vorbis
-- patched to use oggenc by default (since we ship it)
-- changed location of the desktop file
-
-* Wed Aug 9 2000 Tim Powers <timp at redhat.com>
-- added Serial so that we can upgrade from the Helix packages for 6.2
-
-* Mon Jul 24 2000 Prospector <prospector at redhat.com>
-- rebuilt
-
-* Wed Jul 12 2000 Than Ngo <than at redhat.de>
-- rebuilt
-
-* Fri Jun 16 2000 Preston Brown <pbrown at redhat.com>
-- include icon properly
-- fix up man path patch
-
-* Wed Jun 7 2000 Tim Powers <timp at redhat.com>
-- fixed manpage location
-- use %%makeinstall and other predefined macros wherever possible
-
-* Fri May 12 2000 Tim Powers <timp at redhat.com>
-- updated to 2.94
-
-* Sun Feb 06 2000 Preston Brown <pbrown at redhat.com>
-- fix more problems w/man page because of gzip
-
-* Sun Jan 16 2000 Preston Brown <pbrown at redhat.com>
-- 2.91
-- fix man page symlink
-
-* Thu Nov 11 1999 Tim Powers <timp at redhat.com>
-- updated to 2.8
-- no longer need separate cdparanoia source
-- gzip man pages
-- added desktop entry
-
-* Mon Aug 30 1999 Bill Nottingham <notting at redhat.com>
-- update to 2.6
-
-* Thu Jul 15 1999 Tim Powers <timp at redhat.com>
-- updated grip source
-- included cdparanoia source, builds during the build routine so
-  we can have a complete grip build
-- and all were happy when it twas built for 6.1
-
-* Sat Apr 18 1999 Michael Maher <mike at redhat.com>
-- built package for 6.0