rpms/viruskiller/devel viruskiller-1.0-makefile.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 viruskiller.spec, 1.8, 1.9 viruskiller-0.9-makefile.patch, 1.1, NONE viruskiller-0.9-zzip.patch, 1.1, NONE

Mon Mar 6 17:03:39 UTC 2006

Author: thias

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

Modified Files:
	.cvsignore sources viruskiller.spec 
Added Files:
	viruskiller-1.0-makefile.patch 
Removed Files:
	viruskiller-0.9-makefile.patch viruskiller-0.9-zzip.patch 
Log Message:
Update to 1.0-1.


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	2006-03-06 17:47:30.000000000 +0100
@@ -7,18 +7,16 @@ VERSION = 1.0
 RELEASE = 1
 USEPAK = 1
 
-PREFIX=$(DESTDIR)/usr
+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/
+DATADIR = $(PREFIX)/share/games/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
+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
 
 OBJS += CAudio.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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/viruskiller/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2004 02:51:06 -0000	1.2
+++ .cvsignore	6 Mar 2006 17:03:39 -0000	1.3
@@ -1 +1 @@
-viruskiller-0.9-1.tar.gz
+viruskiller-1.0-1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/viruskiller/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2004 02:51:06 -0000	1.2
+++ sources	6 Mar 2006 17:03:39 -0000	1.3
@@ -1 +1 @@
-5dd118cce987cf0cea027f5960bd53e1  viruskiller-0.9-1.tar.gz
+de7c78b3abdb4ff488943d78a94f5bb1  viruskiller-1.0-1.tar.gz


Index: viruskiller.spec
===================================================================
RCS file: /cvs/extras/rpms/viruskiller/devel/viruskiller.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- viruskiller.spec	6 Mar 2006 15:04:42 -0000	1.8
+++ viruskiller.spec	6 Mar 2006 17:03:39 -0000	1.9
@@ -1,17 +1,16 @@
 Summary: Frantic shooting game where viruses invade your computer
 Name: viruskiller
-Version: 0.9
-Release: 7%{?dist}
+Version: 1.0
+Release: 1%{?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, desktop-file-utils
+BuildRequires: zlib-devel, desktop-file-utils
 
 %description
 Your computer has been invaded! Dozens of little viruses are pouring in via
@@ -26,7 +25,6 @@
 %prep
 %setup
 %patch0 -p1 -b .makefile
-%patch1 -p1 -b .zzip
 
 
 %build
@@ -68,14 +66,17 @@
 %defattr(-, root, root, 0755)
 %doc doc/*
 %{_prefix}/games/viruskiller
-%{_prefix}/share/games/viruskiller
+%{_prefix}/share/games/viruskiller/
 %{_datadir}/pixmaps/viruskiller.png
 %{_datadir}/applications/*%{name}.desktop
 
 
 %changelog
-* Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 0.9-7
-- FC5 rebuild.
+* 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.


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


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


