rpms/viruskiller/EL-4 viruskiller-1.0-makefile.patch, NONE, 1.1 viruskiller.spec, 1.3, 1.4 viruskiller-0.9-makefile.patch, 1.1, NONE viruskiller-0.9-zzip.patch, 1.1, NONE

Matthias Saou (thias) fedora-extras-commits at redhat.com
Fri Jun 15 14:43:15 UTC 2007 

Author: thias

Update of /cvs/extras/rpms/viruskiller/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3945/EL-4

Modified Files:
	viruskiller.spec 
Added Files:
	viruskiller-1.0-makefile.patch 
Removed Files:
	viruskiller-0.9-makefile.patch viruskiller-0.9-zzip.patch 
Log Message:
Move binary and data to "proper" locations by updating patch (#243031).


viruskiller-1.0-makefile.patch:

--- NEW FILE viruskiller-1.0-makefile.patch ---
diff -Naupr viruskiller-1.0.orig/makefile viruskiller-1.0/makefile
--- viruskiller-1.0.orig/makefile	2005-05-21 19:03:45.000000000 +0200
+++ viruskiller-1.0/makefile	2007-06-14 13:38:08.000000000 +0200
@@ -7,19 +7,17 @@ VERSION = 1.0
 RELEASE = 1
 USEPAK = 1
 
-PREFIX=$(DESTDIR)/usr
-BINDIR = $(PREFIX)/games/
-DATADIR = $(PREFIX)/share/games/parallelrealities/
-DOCDIR = $(PREFIX)/share/doc/$(PROG)-$(VERSION)-$(RELEASE)/
-ICONDIR = $(PREFIX)/share/icons/
-KDE = $(PREFIX)/share/applnk/Games/Arcade/
-GNOME = $(PREFIX)/share/gnome/apps/Games/
+PREFIX = $(DESTDIR)/usr
+BINDIR = $(PREFIX)/bin/
+DATADIR = $(PREFIX)/share/viruskiller/
+ICONDIR = $(PREFIX)/share/pixmaps/
+GNOME = $(PREFIX)/share/applications/
 
 SAFEDIR = /tmp/
 
-CFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK)
-CFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DSAFEDIR=\"$(SAFEDIR)\" -DUNIX -DGAMEPLAYMANUAL=\"$(DOCDIR)manual.html\" -Wall
-LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf
+CFLAGS += $(OPTFLAGS) `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK)
+CFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DSAFEDIR=\"$(SAFEDIR)\" -DUNIX -DGAMEPLAYMANUAL=\"$(DATADIR)manual.html\"
+LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz
 
 OBJS += CAudio.o 
 OBJS += CBase.o
@@ -77,19 +75,10 @@ install:
 	./pak data gfx music sound $(PAKNAME)
 	mkdir -p $(BINDIR)
 	mkdir -p $(DATADIR)
-	mkdir -p $(DOCDIR)
 	mkdir -p $(ICONDIR)
-	mkdir -p $(ICONDIR)mini
-	mkdir -p $(ICONDIR)large
-	mkdir -p $(KDE)
 	mkdir -p $(GNOME)
 
-	strip $(PROG)
-	install -o root -g games -m 755 $(PROG) $(BINDIR)$(PROG)
-	install -o root -g games -m 644 $(PAKNAME) $(DATADIR)$(PAKNAME)
-	cp $(DOCS) $(DOCDIR)
+	install -m 755 $(PROG) $(BINDIR)$(PROG)
+	install -m 644 $(PAKNAME) $(DATADIR)$(PAKNAME)
 	cp $(ICONS)$(PROG).png $(ICONDIR)
-	cp $(ICONS)$(PROG)-mini.png $(ICONDIR)mini/$(PROG).png
-	cp $(ICONS)$(PROG)-large.png $(ICONDIR)large/$(PROG).png
-	cp $(ICONS)$(PROG).desktop $(KDE)
 	cp $(ICONS)$(PROG).desktop $(GNOME)


Index: viruskiller.spec
===================================================================
RCS file: /cvs/extras/rpms/viruskiller/EL-4/viruskiller.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- viruskiller.spec	28 Feb 2005 21:12:58 -0000	1.3
+++ viruskiller.spec	15 Jun 2007 14:42:40 -0000	1.4
@@ -1,24 +1,16 @@
-%define desktop_vendor fedora
-
-%{?dist: %{expand: %%define %dist 1}}
-
-%{?el2:%define _without_freedesktop 1}
-%{?rh7:%define _without_freedesktop 1}
-
 Summary: Frantic shooting game where viruses invade your computer
 Name: viruskiller
-Version: 0.9
-Release: 2
+Version: 1.0
+Release: 4%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://www.parallelrealities.co.uk/virusKiller.php
+# No absolute URL since the home page tunnels it through a PHP script
 Source: viruskiller-%{version}-1.tar.gz
-Patch0: viruskiller-0.9-makefile.patch
-Patch1: viruskiller-0.9-zzip.patch
+Patch0: viruskiller-1.0-makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_ttf-devel
-BuildRequires: zziplib-devel
-%{!?_without_freedesktop:BuildRequires: desktop-file-utils}
+BuildRequires: zlib-devel, desktop-file-utils
 
 %description
 Your computer has been invaded! Dozens of little viruses are pouring in via
@@ -29,14 +21,14 @@
 will just eat them right there on the spot! See how long you and your computer
 can survive the onslaught!
 
-Available rpmbuild rebuild options :
---without : freedesktop
-
 
 %prep
-%setup
+%setup -q
 %patch0 -p1 -b .makefile
-%patch1 -p1 -b .zzip
+# Replace the displayed location of the help (in-game) to the proper one
+%{__perl} -pi -e 's|/usr/share/doc/viruskiller/manual.html|%{_docdir}/%{name}-%{version}/manual.html|g' data/titleWidgets
+# No files need to be executable, yet quite a few are, so fix that
+find . -type f -exec %{__chmod} -x {} \;
 
 
 %build
@@ -56,23 +48,18 @@
 Name=Virus Killer
 Comment=Frantic shooting game where viruses invade your computer
 Icon=viruskiller.png
-Exec=%{_prefix}/games/viruskiller
+Exec=viruskiller
 Terminal=false
 Type=Application
 Categories=Application;Game;ArcadeGame;
 Encoding=UTF-8
 EOF
 
-%if %{!?_without_freedesktop:1}0
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
 desktop-file-install \
-    --vendor %{desktop_vendor} \
+    --vendor fedora \
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
-%else
-%{__install} -D -m 0644 %{name}.desktop \
-    %{buildroot}%{_sysconfdir}/X11/applnk/Games/%{name}.desktop
-%endif
 
 
 %clean
@@ -80,19 +67,45 @@
 
 
 %files
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc doc/*
-%{_prefix}/games/viruskiller
-%{_prefix}/share/games/viruskiller
+%{_bindir}/viruskiller
+%{_datadir}/viruskiller/
 %{_datadir}/pixmaps/viruskiller.png
-%if %{!?_without_freedesktop:1}0
-%{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
-%else
-%{_sysconfdir}/X11/applnk/Games/%{name}.desktop
-%endif
+%{_datadir}/applications/*%{name}.desktop
 
 
 %changelog
+* Thu Jun 14 2007 Matthias Saou <http://freshrpms.net/> 1.0-4
+- Move binary and data to "proper" locations by updating patch (#243031).
+- Remove executable bit from all files from the archive, it shouldn't be set.
+
+* Fri Feb  2 2007 Matthias Saou <http://freshrpms.net/> 1.0-3
+- Make in-game help display the proper location for the manual.html (#220404).
+
+* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.0-2
+- FC6 rebuild.
+- Add -lz to LIBS in the makefile patch (no longer in SDL libs?).
+
+* Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 1.0-1
+- Update to 1.0-1.
+- Update makefile patch.
+- Remove no longer needed zziplib patch.
+- No longer build require zziplib-devel, but zlib-devel instead.
+
+* Thu Feb  9 2006 Matthias Saou <http://freshrpms.net/> 0.9-6
+- Rebuild for new gcc/glibc.
+- Remove old desktop file conditionals.
+
+* Tue May 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9-5
+- rebuild once more as 0.9-4 src.rpm failed to build in build system
+
+* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.9-4
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Sun Feb 27 2005 Matthias Saou <http://freshrpms.net/> 0.9-2
 - Fix release tag.
 


--- viruskiller-0.9-makefile.patch DELETED ---


--- viruskiller-0.9-zzip.patch DELETED ---

More information about the fedora-extras-commits mailing list