rpms/viruskiller/FC-5 viruskiller-1.0-makefile.patch, 1.1, 1.2 viruskiller.spec, 1.9, 1.10
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Fri Jun 15 14:43:32 UTC 2007
Author: thias
Update of /cvs/extras/rpms/viruskiller/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3945/FC-5
Modified Files:
viruskiller-1.0-makefile.patch viruskiller.spec
Log Message:
Move binary and data to "proper" locations by updating patch (#243031).
viruskiller-1.0-makefile.patch:
Index: viruskiller-1.0-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/viruskiller/FC-5/viruskiller-1.0-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- viruskiller-1.0-makefile.patch 6 Mar 2006 17:03:39 -0000 1.1
+++ viruskiller-1.0-makefile.patch 15 Jun 2007 14:42:57 -0000 1.2
@@ -1,19 +1,20 @@
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
++++ 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
-+PREFIX = $(DESTDIR)/usr
- BINDIR = $(PREFIX)/games/
+-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/
++PREFIX = $(DESTDIR)/usr
++BINDIR = $(PREFIX)/bin/
++DATADIR = $(PREFIX)/share/viruskiller/
+ICONDIR = $(PREFIX)/share/pixmaps/
+GNOME = $(PREFIX)/share/applications/
@@ -21,11 +22,13 @@
-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
++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)
Index: viruskiller.spec
===================================================================
RCS file: /cvs/extras/rpms/viruskiller/FC-5/viruskiller.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- viruskiller.spec 6 Mar 2006 17:03:39 -0000 1.9
+++ viruskiller.spec 15 Jun 2007 14:42:57 -0000 1.10
@@ -1,7 +1,7 @@
Summary: Frantic shooting game where viruses invade your computer
Name: viruskiller
Version: 1.0
-Release: 1%{?dist}
+Release: 4%{?dist}
License: GPL
Group: Amusements/Games
URL: http://www.parallelrealities.co.uk/virusKiller.php
@@ -23,8 +23,12 @@
%prep
-%setup
+%setup -q
%patch0 -p1 -b .makefile
+# 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
@@ -44,7 +48,7 @@
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;
@@ -63,15 +67,26 @@
%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
%{_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.
More information about the scm-commits
mailing list