rpms/trackballs/F-7 trackballs-1.1.4-destdir.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 trackballs.desktop, 1.2, 1.3 trackballs-16.png, 1.1, NONE trackballs-32.png, 1.1, NONE trackballs-48.png, 1.1, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/trackballs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32712

Modified Files:
	.cvsignore sources trackballs.desktop 
Added Files:
	trackballs-1.1.4-destdir.patch 
Removed Files:
	trackballs-16.png trackballs-32.png trackballs-48.png 
Log Message:
* Thu Jan  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.1.4-4
- Fix black vertices on ATI cards with OSS drivers


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/F-7/.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	3 Jan 2008 17:48:36 -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/F-7/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	3 Jan 2008 17:48:36 -0000	1.3
@@ -1 +1 @@
-9ea9ca93d87bb0f9ad8abca1b34af594  trackballs-1.1.2.tar.gz
+84e2e8bb68842a636da91673751279a0  trackballs-1.1.4.tar.gz


Index: trackballs.desktop
===================================================================
RCS file: /cvs/extras/rpms/trackballs/F-7/trackballs.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trackballs.desktop	10 Mar 2007 09:49:36 -0000	1.2
+++ trackballs.desktop	3 Jan 2008 17:48:36 -0000	1.3
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Name=Trackballs
 Comment=Steer a marble ball through a labyrinth
-Exec=trackballs
+Exec=trackballs-wrapper
 Icon=trackballs.png
 Terminal=false
 Type=Application