rpms/tagtool/devel tagtool-desktop.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tagtool-contents.patch, 1.1, 1.2 tagtool.spec, 1.8, 1.9 tagtool-genre.patch, 1.1, NONE

Brian Pepple (bpepple) fedora-extras-commits at redhat.com
Wed Feb 28 03:40:34 UTC 2007 

Author: bpepple

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

Modified Files:
	.cvsignore sources tagtool-contents.patch tagtool.spec 
Added Files:
	tagtool-desktop.patch 
Removed Files:
	tagtool-genre.patch 
Log Message:
* Tue Feb 27 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.12.3-1
- Drop genre patch, fixed upstream.
- Add scriptlets for gtk-icon-cache.
- Add patch to fix desktop file.
- Drop X-Fedora category from desktop file.


tagtool-desktop.patch:

--- NEW FILE tagtool-desktop.patch ---
diff -ur tagtool-0.12.3.OLD/data/tagtool.desktop.in tagtool-0.12.3/data/tagtool.desktop.in
--- tagtool-0.12.3.OLD/data/tagtool.desktop.in	2006-12-17 13:01:24.000000000 -0500
+++ tagtool-0.12.3/data/tagtool.desktop.in	2007-02-27 22:23:06.000000000 -0500
@@ -3,6 +3,6 @@
 _Comment=MP3 and Ogg Vorbis tag editor
 Exec=tagtool
 Icon=TagTool
-Terminal=False
+Terminal=false
 Type=Application
 Categories=Audio;AudioVideo;AudioVideoEditing;
Only in tagtool-0.12.3/data: tagtool.desktop.in~


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tagtool/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Sep 2005 12:09:44 -0000	1.2
+++ .cvsignore	28 Feb 2007 03:40:01 -0000	1.3
@@ -1 +1 @@
-tagtool-0.12.2.tar.gz
+tagtool-0.12.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tagtool/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Sep 2005 12:09:44 -0000	1.2
+++ sources	28 Feb 2007 03:40:01 -0000	1.3
@@ -1 +1 @@
-4d688dbbe7cd8a08a9f9faef4d1c5b27  tagtool-0.12.2.tar.gz
+447b3a505fee68a82f25dcda9377b676  tagtool-0.12.3.tar.bz2

tagtool-contents.patch:

Index: tagtool-contents.patch
===================================================================
RCS file: /cvs/extras/rpms/tagtool/devel/tagtool-contents.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tagtool-contents.patch	24 Sep 2005 12:09:44 -0000	1.1
+++ tagtool-contents.patch	28 Feb 2007 03:40:01 -0000	1.2
@@ -1,26 +1,28 @@
-diff -ur tagtool-0.12.2.OLD/src/main_win.c tagtool-0.12.2/src/main_win.c
---- tagtool-0.12.2.OLD/src/main_win.c	2005-05-26 05:44:21.000000000 -0400
-+++ tagtool-0.12.2/src/main_win.c	2005-09-16 15:08:45.000000000 -0400
-@@ -61,15 +61,6 @@
+diff -ur tagtool-0.12.3.OLD/src/main_win.c tagtool-0.12.3/src/main_win.c
+--- tagtool-0.12.3.OLD/src/main_win.c	2006-12-17 13:01:21.000000000 -0500
++++ tagtool-0.12.3/src/main_win.c	2007-02-27 22:14:37.000000000 -0500
+@@ -61,17 +61,6 @@
  	prefs_display();
  }
  
 -void cb_help_contents(GtkWidget *widget, GdkEvent *event)
 -{
+-/*
 -	GError *err = NULL;        
 -
 -	// XXX - should check with g_find_program_in_path()
 -
 -	g_spawn_command_line_async ("yelp "HELPDIR"tagtool.xml", &err);
+-*/
 -}
 -
  void cb_help_about(GtkWidget *widget, GdkEvent *event)
  {
  	about_display();
-diff -ur tagtool-0.12.2.OLD/src/tagtool.glade tagtool-0.12.2/src/tagtool.glade
---- tagtool-0.12.2.OLD/src/tagtool.glade	2005-05-26 11:12:54.000000000 -0400
-+++ tagtool-0.12.2/src/tagtool.glade	2005-09-16 16:08:50.000000000 -0400
-@@ -274,27 +274,6 @@
+diff -ur tagtool-0.12.3.OLD/src/tagtool.glade tagtool-0.12.3/src/tagtool.glade
+--- tagtool-0.12.3.OLD/src/tagtool.glade	2007-02-27 16:19:56.000000000 -0500
++++ tagtool-0.12.3/src/tagtool.glade	2007-02-27 22:17:46.000000000 -0500
+@@ -278,27 +278,6 @@
  		<widget class="GtkMenu" id="m_help_menu">
  
  		  <child>


Index: tagtool.spec
===================================================================
RCS file: /cvs/extras/rpms/tagtool/devel/tagtool.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tagtool.spec	17 Oct 2006 19:06:19 -0000	1.8
+++ tagtool.spec	28 Feb 2007 03:40:01 -0000	1.9
@@ -1,14 +1,14 @@
 Name:		tagtool
-Version:	0.12.2
-Release:	9%{?dist}
+Version:	0.12.3
+Release:	1%{?dist}
 Summary:	Ogg Vorbis and MP3 tag manager
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://pwp.netcabo.pt/paol/tagtool/
-Source0:	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Patch1:		%{name}-contents.patch
-Patch2:		%{name}-genre.patch
+Patch2:		%{name}-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libglade2-devel
@@ -33,8 +33,8 @@
 
 %prep
 %setup -q
-%patch2 -p1 -b .genre
 %patch1 -p1 -b .contents
+%patch2 -p1 -b .desktop
 
 
 %build
@@ -49,7 +49,6 @@
 
 desktop-file-install --vendor fedora --delete-original	\
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
-  --add-category X-Fedora			        \
   --add-category AudioVideoEditing			\
   --add-category AudioVideo				\
   --add-category Application				\
@@ -62,10 +61,18 @@
 
 %post
 update-desktop-database &> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %postun
 update-desktop-database &> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %files -f %{name}.lang
@@ -74,10 +81,17 @@
 %{_bindir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/%{name}/
-%{_datadir}/pixmaps/TagTool.png
+%{_datadir}/icons/hicolor/48x48/apps/TagTool.png
+%{_datadir}/icons/hicolor/scalable/apps/TagTool.svg
 
 
 %changelog
+* Tue Feb 27 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.12.3-1
+- Drop genre patch, fixed upstream.
+- Add scriptlets for gtk-icon-cache.
+- Add patch to fix desktop file.
+- Drop X-Fedora category from desktop file.
+
 * Tue Oct 17 2006 Brian Pepple <bpepple at fedoraproject.org> - 0.12.2-9
 - Add patch to fix genre ui bug. (#211145)
 


--- tagtool-genre.patch DELETED ---

More information about the scm-commits mailing list