rpms/trackballs/devel trackballs-1.1.4-destdir.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 trackballs.spec, 1.3, 1.4 trackballs-16.png, 1.1, NONE trackballs-32.png, 1.1, NONE trackballs-48.png, 1.1, NONE

Tue Jun 5 19:22:10 UTC 2007

Author: jwrdegoede

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

Modified Files:
	.cvsignore sources trackballs.spec 
Added Files:
	trackballs-1.1.4-destdir.patch 
Removed Files:
	trackballs-16.png trackballs-32.png trackballs-48.png 
Log Message:
* Tue Jun  5 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.4-1
- New upstream release 1.1.4


trackballs-1.1.4-destdir.patch:

--- NEW FILE trackballs-1.1.4-destdir.patch ---
--- trackballs-1.1.4/share/icons/Makefile.in~	2007-06-05 18:57:33.000000000 +0200
+++ trackballs-1.1.4/share/icons/Makefile.in	2007-06-05 18:57:33.000000000 +0200
@@ -374,12 +374,12 @@
 	echo "Exec=$(bindir)/trackballs" >> trackballs.desktop
 
 install-iconsDATA:
-	$(mkinstalldirs) $(iconsdir)/32x32/apps
-	$(INSTALL_DATA) $(srcdir)/trackballs-32x32.png $(iconsdir)/32x32/apps/trackballs.png
-	$(mkinstalldirs) $(iconsdir)/48x48/apps
-	$(INSTALL_DATA) $(srcdir)/trackballs-48x48.png $(iconsdir)/48x48/apps/trackballs.png
-	$(mkinstalldirs) $(iconsdir)/64x64/apps
-	$(INSTALL_DATA) $(srcdir)/trackballs-64x64.png $(iconsdir)/64x64/apps/trackballs.png
+	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/32x32/apps
+	$(INSTALL_DATA) $(srcdir)/trackballs-32x32.png $(DESTDIR)$(iconsdir)/32x32/apps/trackballs.png
+	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/48x48/apps
+	$(INSTALL_DATA) $(srcdir)/trackballs-48x48.png $(DESTDIR)$(iconsdir)/48x48/apps/trackballs.png
+	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/64x64/apps
+	$(INSTALL_DATA) $(srcdir)/trackballs-64x64.png $(DESTDIR)$(iconsdir)/64x64/apps/trackballs.png
 
 uninstall-iconsDATA:
 	-rm -f $(iconsdir)/32x32/apps/trackballs.png
--- trackballs-1.1.4/share/icons/Makefile.am~	2007-06-05 18:57:08.000000000 +0200
+++ trackballs-1.1.4/share/icons/Makefile.am	2007-06-05 18:57:08.000000000 +0200
@@ -13,12 +13,12 @@
 EXTRA_DIST = $(desktop_DATA) $(icons_DATA) trackballs.desktop.in
 
 install-iconsDATA:
-	$(mkinstalldirs) $(iconsdir)/32x32/apps
-	$(INSTALL_DATA) $(srcdir)/trackballs-32x32.png $(iconsdir)/32x32/apps/trackballs.png
-	$(mkinstalldirs) $(iconsdir)/48x48/apps
-	$(INSTALL_DATA) $(srcdir)/trackballs-48x48.png $(iconsdir)/48x48/apps/trackballs.png
-	$(mkinstalldirs) $(iconsdir)/64x64/apps
-	$(INSTALL_DATA) $(srcdir)/trackballs-64x64.png $(iconsdir)/64x64/apps/trackballs.png
+	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/32x32/apps
+	$(INSTALL_DATA) $(srcdir)/trackballs-32x32.png $(DESTDIR)$(iconsdir)/32x32/apps/trackballs.png
+	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/48x48/apps
+	$(INSTALL_DATA) $(srcdir)/trackballs-48x48.png $(DESTDIR)$(iconsdir)/48x48/apps/trackballs.png
+	$(mkinstalldirs) $(DESTDIR)$(iconsdir)/64x64/apps
+	$(INSTALL_DATA) $(srcdir)/trackballs-64x64.png $(DESTDIR)$(iconsdir)/64x64/apps/trackballs.png
 
 
 uninstall-iconsDATA:
--- trackballs-1.1.4/po/Makefile.in.in~	2007-06-05 19:31:45.000000000 +0200
+++ trackballs-1.1.4/po/Makefile.in.in	2007-06-05 19:31:45.000000000 +0200
@@ -27,7 +27,7 @@
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs
 mkinstalldirs = ../mkinstalldirs
 ###$(top_builddir)/./mkinstalldirs
 ### mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trackballs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Aug 2006 18:35:32 -0000	1.2
+++ .cvsignore	5 Jun 2007 19:21:29 -0000	1.3
@@ -1 +1 @@
-trackballs-1.1.2.tar.gz
+trackballs-1.1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trackballs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Aug 2006 18:35:32 -0000	1.2
+++ sources	5 Jun 2007 19:21:29 -0000	1.3
@@ -1 +1 @@
-9ea9ca93d87bb0f9ad8abca1b34af594  trackballs-1.1.2.tar.gz
+84e2e8bb68842a636da91673751279a0  trackballs-1.1.4.tar.gz


Index: trackballs.spec
===================================================================
RCS file: /cvs/extras/rpms/trackballs/devel/trackballs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- trackballs.spec	10 Mar 2007 09:49:36 -0000	1.3
+++ trackballs.spec	5 Jun 2007 19:21:29 -0000	1.4
@@ -1,15 +1,13 @@
 Name:           trackballs
-Version:        1.1.2
-Release:        4%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        Steer a marble ball through a labyrinth
 Group:          Amusements/Games
 License:        GPL
 URL:            http://trackballs.sourceforge.net/
-Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
-Source2:        %{name}-16.png
-Source3:        %{name}-32.png
-Source4:        %{name}-48.png
+Patch0:         trackballs-1.1.4-destdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  guile-devel libGLU-devel zlib-devel desktop-file-utils
 BuildRequires:  SDL_ttf-devel SDL_mixer-devel SDL_image-devel
@@ -23,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 iconv -f ISO-8859-1 -t UTF8 share/%{name}.6 > share/%{name}.6.tmp
 mv share/%{name}.6.tmp share/%{name}.6
 # the install script does a chgrp to 'games', this doesn't work while
@@ -44,20 +43,11 @@
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/highScores
 %find_lang %{name}
 
-# below is the desktop file and icon stuff.
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+# remove the broken upstream provided desktop file and use our own.
+rm $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 desktop-file-install --vendor fedora            \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE1}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-install -p -m 644 %{SOURCE2} \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -p -m 644 %{SOURCE3} \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -p -m 644 %{SOURCE4} \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 
 %clean
@@ -74,7 +64,7 @@
 
 
 %files -f %{name}.lang
-%doc AUTHORS COPYING ChangeLog FAQ README README.html TODO
+%doc AUTHORS COPYING ChangeLog FAQ README TODO
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
 %{_datadir}/%{name}
@@ -84,6 +74,9 @@
 
 
 %changelog
+* Tue Jun  5 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.4-1
+- New upstream release 1.1.4
+
 * Sat Mar 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.2-4
 - Fixup .desktop file categories for games-menus usage
 


