rpms/npush/devel npush-0.7-level.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 npush.spec, 1.1, 1.2 sources, 1.2, 1.3 npush-0.6-level-svn.patch, 1.1, NONE npush.desktop, 1.1, NONE npush.png, 1.1, NONE

[Stefan Posdzich (cheekyboinc)]

Author: cheekyboinc

Update of /cvs/pkgs/rpms/npush/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8148

Modified Files:
	.cvsignore npush.spec sources 
Added Files:
	npush-0.7-level.patch 
Removed Files:
	npush-0.6-level-svn.patch npush.desktop npush.png 
Log Message:
Update to 0.7 and other changes


npush-0.7-level.patch:

--- NEW FILE npush-0.7-level.patch ---
--- npush.cpp	2008-06-24 20:15:10.000000000 +0200
+++ npush.cpp.patch	2008-07-12 19:06:35.000000000 +0200
@@ -602,7 +602,7 @@
     players.clear ();
     mapM.clear ();
     goldNeededM = 0;
-    std::string fileName = "levels/" + name;
+    std::string fileName = "/usr/share/npush/levels/" + name;
     FILE *fp = fopen (fileName.c_str (), "rb");
     if (!fp) {
         Message ("Cannot open level file!");
@@ -757,7 +757,7 @@
      */
     std::set < std::string > files;
     DIR *
-    dir = opendir ("levels");
+    dir = opendir ("/usr/share/npush/levels");
     if (!dir) {
         Message ("Cannot read levels from directory");
         return;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/npush/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jul 2008 18:18:25 -0000	1.2
+++ .cvsignore	12 Jul 2008 17:47:14 -0000	1.3
@@ -1 +1 @@
-npush-0.6.tgz
+npush-0.7.tgz


Index: npush.spec
===================================================================
RCS file: /cvs/pkgs/rpms/npush/devel/npush.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- npush.spec	9 Jul 2008 18:18:25 -0000	1.1
+++ npush.spec	12 Jul 2008 17:47:14 -0000	1.2
@@ -1,17 +1,14 @@
 Name:		npush
-Version:	0.6
+Version:	0.7
 Release:	1%{?dist}
-Summary:	A logic game similar to Sokoba
+Summary:	A logic game similar to Sokoban
 
 Group:		Amusements/Games
 License:	GPLv2+
 URL:		http://npush.sourceforge.net/
-Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
-# self made icon and .desktop file
-Source1:	%{name}.desktop
-Source2:	%{name}.png
-# patch npush.cpp to svn version to fix an issue with level selector
-Patch:		npush-0.6-level-svn.patch
+Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
+# patch npush.cpp to fix an issue with level path
+Patch0:		npush-0.7-level.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ncurses-devel desktop-file-utils
@@ -30,11 +27,11 @@
 
 %prep
 %setup -q
-%patch -p0
+%patch0 -p0
 
 %build
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}"
 
 
 %install
@@ -44,16 +41,18 @@
 install -p -m 755 npush %{buildroot}%{_bindir}/npush
 
 mkdir -p %{buildroot}%{_datadir}/npush
-cp -ra Level*  %{buildroot}%{_datadir}/npush
+cp -ra levels*  %{buildroot}%{_datadir}/npush
 
 # desktop file stuff
-desktop-file-install --vendor="fedora"			\
-	--dir=$RPM_BUILD_ROOT%{_datadir}/applications	\
-	%{SOURCE1}
+desktop-file-install --vendor="fedora" \
+	--delete-original \
+	--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+	%{name}.desktop
+
 # icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
 
-install -p -m 0644 %{SOURCE2}				\
+install -p -m 0644 %{name}.png				\
 	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 
@@ -77,12 +76,18 @@
 
 %files
 %defattr(-,root,root,-)
-%doc readme.txt
+%doc CHANGES COPYING CREDITS readme.txt
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 %changelog
+* Sat Jul 12 2008 Stefan Posdzich <cheekyboinc at foresightlinux.org> - 0.7-1
+- Update to 0.7
+- Upstream now ships our .desktop an icon file
+- Add npush-0.7-level.patch to fix level path
+- Remove obsolete npush-0.6-level-svn.patch
+
 * Mon Jul 07 2008 Stefan Posdzich <cheekyboinc at foresightlinux.org> - 0.6-1
 - Initial SPEC file


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/npush/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jul 2008 18:18:25 -0000	1.2
+++ sources	12 Jul 2008 17:47:14 -0000	1.3
@@ -1 +1 @@
-6670aac74dd7db005462c11c5688db52  npush-0.6.tgz
+e39180c6ec228ebafb91ff2921f7bdcc  npush-0.7.tgz


--- npush-0.6-level-svn.patch DELETED ---


--- npush.desktop DELETED ---