rpms/freedroid/devel freedroid-1.0.2-printfs.patch, NONE, 1.1 freedroid.spec, 1.7, 1.8

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	freedroid.spec 
Added Files:
	freedroid-1.0.2-printfs.patch 
Log Message:
* Tue Feb 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-5
- Fix crash when the config file cannot be read/written to (#182280).
- Install icon to %{_datadir}/icons/hicolor, update GTK icon cache at
  post(un)install time.
- Build with dependency tracking disabled.
- List installed files explicitly.


freedroid-1.0.2-printfs.patch:

--- NEW FILE freedroid-1.0.2-printfs.patch ---
--- freedroid-1.0.2/src/text.c~	2003-07-11 03:20:16.000000000 +0300
+++ freedroid-1.0.2/src/text.c	2006-02-21 20:38:27.000000000 +0200
@@ -507,7 +507,7 @@
     } /* while(!finished) */
 
   DebugPrintf (2, "\n\nchar *GetString(..):  The final string is:\n");
-  DebugPrintf (2,  input );
+  DebugPrintf (2, "%s", input );
   DebugPrintf (2, "\n\n");
 
 
--- freedroid-1.0.2/src/misc.c~	2003-08-08 14:31:03.000000000 +0300
+++ freedroid-1.0.2/src/misc.c	2006-02-21 20:41:17.000000000 +0200
@@ -175,7 +175,7 @@
 
   if( (fp = fopen (fname, "r")) == NULL)
     {
-      DebugPrintf (0, "WARNING: failed to open config-file: %s\n");
+      DebugPrintf (0, "WARNING: failed to open config-file: %s\n", fname);
       return (ERR);
     }
 
@@ -247,7 +247,7 @@
   sprintf (fname, "%s/config", ConfigDir);
   if( (fp = fopen (fname, "w")) == NULL)
     {
-      DebugPrintf (0, "WARNING: failed to create config-file: %s\n");
+      DebugPrintf (0, "WARNING: failed to create config-file: %s\n", fname);
       return (ERR);
     }
   
@@ -889,7 +889,7 @@
   if (db_level <= debug_level)
     {
       vsnprintf (buffer, 5000, fmt, args);
-      fprintf (stderr, buffer);
+      fprintf (stderr, "%s", buffer);
       fflush (stderr);
     }
 
--- freedroid-1.0.2/src/init.c~	2003-08-09 15:19:32.000000000 +0300
+++ freedroid-1.0.2/src/init.c	2006-02-21 20:22:07.000000000 +0200
@@ -554,13 +554,13 @@
 	   * following gnu-coding standards for command line interfaces */
 	case 'v':
 	  printf ("\n%s %s  \n", PACKAGE, VERSION); 
-	  printf (copyright);
+	  printf ("%s", copyright);
 	  exit (0);
 	  break;
 
 	case 'h':
 	case '?':
-	  printf (usage_string);
+	  printf ("%s", usage_string);
 	  exit (0);
 	  break;
 


Index: freedroid.spec
===================================================================
RCS file: /cvs/extras/rpms/freedroid/devel/freedroid.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- freedroid.spec	15 Feb 2006 19:30:40 -0000	1.7
+++ freedroid.spec	21 Feb 2006 19:09:31 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           freedroid
 Version:        1.0.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Clone of the C64 game Paradroid
 
 Group:          Amusements/Games
@@ -9,6 +9,7 @@
 Source0:        http://download.sf.net/freedroid/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 Patch0:         %{name}-cleaninst.patch
+Patch1:         %{name}-1.0.2-printfs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_image-devel
@@ -34,10 +35,11 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 
 
 %build
-%configure --datadir=%{_datadir}/games
+%configure --datadir=%{_datadir}/games --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -50,25 +52,40 @@
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
   %{SOURCE1}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-convert graphics/paraicon.bmp $RPM_BUILD_ROOT%{_datadir}/pixmaps/freedroid.png
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
+convert graphics/paraicon.bmp \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/freedroid.png
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files
 %defattr(0644,root,root,0755)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
-%attr(0755,root,root) %{_bindir}/*
-%{_datadir}/applications/*
-%{_datadir}/pixmaps/*
-%{_datadir}/games/freedroid
-%{_mandir}/*/*
+%attr(0755,root,root) %{_bindir}/freedroid
+%{_datadir}/applications/*freedroid.desktop
+%{_datadir}/icons/hicolor/32x32/apps/freedroid.png
+%{_datadir}/games/freedroid/
+%{_mandir}/man6/freedroid.6*
 
 
 %changelog
+* Tue Feb 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-5
+- Fix crash when the config file cannot be read/written to (#182280).
+- Install icon to %%{_datadir}/icons/hicolor, update GTK icon cache at
+  post(un)install time.
+- Build with dependency tracking disabled.
+- List installed files explicitly.
+
 * Wed Feb 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.2-4
 - Rebuild, cosmetics.