- updated to 1.3.1

- removed obsolete format patch (and older, orphaned ones)
- use upstream .desktop file (with desktop patch)

diff --git a/lgeneral-configure_fix.patch b/lgeneral-configure_fix.patch
deleted file mode 100644 (file)
index ff301c7..0000000
--- a/lgeneral-configure_fix.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -durN lgeneral-1.1.orig/configure.in lgeneral-1.1/configure.in
---- lgeneral-1.1.orig/configure.in     Tue Oct 15 13:55:35 2002
-+++ lgeneral-1.1/configure.in  Tue Oct 15 13:56:43 2002
-@@ -53,4 +53,4 @@
- AC_SUBST(inst_dir)
- AC_SUBST(dis_flag)
- 
--AC_OUTPUT(Makefile src/Makefile src/nations/Makefile src/scenarios/Makefile src/units/Makefile src/sounds/Makefile src/music/Makefile src/maps/Makefile src/gfx/Makefile  src/gfx/flags/Makefile src/gfx/terrain/Makefile src/gfx/units/Makefile src/ai_modules/Makefile src/campaigns/Makefile src/gfx/Makefile src/themes/Makefile src/themes/default/Makefile)
-+AC_OUTPUT(Makefile src/Makefile src/nations/Makefile src/scenarios/Makefile src/units/Makefile src/sounds/Makefile src/music/Makefile src/maps/Makefile src/gfx/Makefile  src/gfx/flags/Makefile src/gfx/terrain/Makefile src/gfx/units/Makefile src/ai_modules/Makefile src/campaigns/Makefile src/themes/Makefile src/themes/default/Makefile)
-diff -durN lgeneral-1.1.orig/configure.in~ lgeneral-1.1/configure.in~
---- lgeneral-1.1.orig/configure.in~    Thu Jan  1 00:00:00 1970
-+++ lgeneral-1.1/configure.in~ Tue Oct 15 13:55:35 2002
-@@ -0,0 +1,56 @@
-+dnl Process this file with autoconf to produce a configure script.
-+AC_INIT(Makefile.am)
-+
-+AM_CONFIG_HEADER(config.h)
-+
-+AM_INIT_AUTOMAKE(lgeneral,1.1)
-+
-+dnl Checks for programs.
-+AC_PROG_CC
-+AC_PROG_RANLIB
-+
-+dnl various CFLAGS
-+CFLAGS="-g"
-+CFLAGS="$CFLAGS -Wall"
-+
-+dnl Checks for libraries.
-+
-+dnl check SDL version
-+AM_PATH_SDL(1.1.4,, AC_MSG_ERROR(lib SDL >=1.1.4 is needed))
-+CFLAGS="$CFLAGS $SDL_CFLAGS"
-+LIBS="$LIBS $SDL_LIBS"
-+
-+dnl check sound
-+sound_flag="-DWITH_SOUND"
-+mixer_flag="-lSDL_mixer"
-+AC_ARG_ENABLE( sound,
-+[  --disable-sound         Disables sound], sound_flag=""; mixer_flag="")
-+
-+dnl check if SDL_mixer's installed
-+dnl if not: clear sound_flag and mixer_flag
-+AC_CHECK_LIB(SDL_mixer, main,
-+AC_MSG_RESULT("SDL_Mixer found"), 
-+AC_MSG_RESULT("SDL_Mixer NOT found \(get it at http://libsdl.org\): Audio disabled"); sound_flag=""; mixer_flag="")
-+
-+AC_SUBST(sound_flag)
-+AC_SUBST(mixer_flag)
-+
-+dnl check use of dynamic libraries
-+dl_flag="-DUSE_DL"
-+AC_ARG_ENABLE( dl,
-+[  --disable-dl         Disable use of dynamic AI modules], dl_flag="")
-+AC_SUBST(dl_flag)
-+
-+dnl installation path
-+inst_dir=$datadir/lgeneral
-+inst_flag="-DSRC_DIR=\\\"$inst_dir\\\""
-+
-+AC_ARG_ENABLE( install,
-+[  --disable-install       No installation. Played from the source directory.], 
-+inst_dir=. inst_flag="-DSRC_DIR=\\\".\\\"" dis_flag="-DDISABLE_INSTALL")
-+
-+AC_SUBST(inst_flag)
-+AC_SUBST(inst_dir)
-+AC_SUBST(dis_flag)
-+
-+AC_OUTPUT(Makefile src/Makefile src/nations/Makefile src/scenarios/Makefile src/units/Makefile src/sounds/Makefile src/music/Makefile src/maps/Makefile src/gfx/Makefile  src/gfx/flags/Makefile src/gfx/terrain/Makefile src/gfx/units/Makefile src/ai_modules/Makefile src/campaigns/Makefile src/gfx/Makefile src/themes/Makefile src/themes/default/Makefile)

diff --git a/lgeneral-desktop.patch b/lgeneral-desktop.patch
new file mode 100644 (file)
index 0000000..7638e7e
--- /dev/null
+++ b/lgeneral-desktop.patch
@@ -0,0 +1,10 @@
+--- lgeneral-1.3.1/lgeneral.desktop.orig       2015-03-10 18:05:04.000000000 +0100
++++ lgeneral-1.3.1/lgeneral.desktop    2016-09-16 15:57:14.331687280 +0200
+@@ -2,6 +2,7 @@
+ Name=LGeneral
+ Comment=LGeneral is a turn-based strategy engine heavily inspired by Panzer General
+ Comment[de]=LGeneral ist eine rundenbasierte Engine für Strategiespiele und wurde stark von Panzer General inspiriert
++Comment[pl]=LGeneral to silnik turowej gry strategicznej zainspirowanej gr± Panzer General
+ Exec=lgeneral
+ Icon=lgeneral
+ Type=Application

diff --git a/lgeneral-format.patch b/lgeneral-format.patch
deleted file mode 100644 (file)
index bb7ba9d..0000000
--- a/lgeneral-format.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- lgeneral-1.2.2/lgc-pg/units.c.orig 2011-08-10 20:07:59.000000000 +0200
-+++ lgeneral-1.2.2/lgc-pg/units.c      2016-09-09 21:24:21.508368910 +0200
-@@ -550,7 +550,7 @@
-             }
-         }
-         /* get flags */
--        sprintf( flags, unit_classes[entry.class * 3 + 2] );
-+        strcpy( flags, unit_classes[entry.class * 3 + 2] );
-         if ( apply_unit_mods ) {
-             i = 0;
-             while ( add_flags[i*2][0] != 'X' ) {
---- lgeneral-1.2.2/src/engine.c.orig   2011-08-05 11:37:44.000000000 +0200
-+++ lgeneral-1.2.2/src/engine.c        2016-09-09 21:25:55.975034497 +0200
-@@ -2311,7 +2311,7 @@
-                 if ( gui->module_dlg->subdir[0] != 0 )
-                     sprintf( path, "%s/%s", gui->module_dlg->subdir, (char*)gui->module_dlg->lbox->cur_item );
-                 else
--                    sprintf( path, (char*)gui->module_dlg->lbox->cur_item );
-+                    strcpy( path, (char*)gui->module_dlg->lbox->cur_item );
-                 free( setup.modules[gui->setup->sel_id] );
-                 setup.modules[gui->setup->sel_id] = strdup( path );
-                 gui_handle_player_select( gui->setup->list->cur_item );
-@@ -2756,7 +2756,7 @@
-                      result = gui_get_message_pane_selection(camp_pane);
-                      if (result && strcmp(result, "nextscen") == 0) {
-                          /* start scenario */
--                         sprintf( setup.fname, camp_cur_scen->scen );
-+                         strcpy( setup.fname, camp_cur_scen->scen );
-                          setup.type = SETUP_DEFAULT_SCEN;
-                          end_scen = 1;
-                          *reinit = 1;
-@@ -4243,7 +4243,7 @@
-                 }
-                 else {
-                     /* next scenario */
--                    sprintf( setup.fname, camp_cur_scen->scen );
-+                    strcpy( setup.fname, camp_cur_scen->scen );
-                     setup.type = SETUP_CAMP_BRIEFING;
-                     reinit = 1;
-                 }

diff --git a/lgeneral-inst_dir.patch b/lgeneral-inst_dir.patch
deleted file mode 100644 (file)
index dc1cec0..0000000
--- a/lgeneral-inst_dir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -durN lgeneral-1.1.orig/configure.in lgeneral-1.1/configure.in
---- lgeneral-1.1.orig/configure.in     Sat Jul 13 21:27:47 2002
-+++ lgeneral-1.1/configure.in  Tue Jul 30 15:20:51 2002
-@@ -42,7 +42,7 @@
- AC_SUBST(dl_flag)
- 
- dnl installation path
--inst_dir=$datadir/games/lgeneral
-+inst_dir=$datadir/lgeneral
- inst_flag="-DSRC_DIR=\\\"$inst_dir\\\""
- 
- AC_ARG_ENABLE( install,

diff --git a/lgeneral-separator.patch b/lgeneral-separator.patch
deleted file mode 100644 (file)
index 761b919..0000000
--- a/lgeneral-separator.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- lgeneral-1.2/intl/Makefile.in~     2006-05-29 18:43:09.000000000 +0200
-+++ lgeneral-1.2/intl/Makefile.in      2010-09-30 10:13:16.768882668 +0200
-@@ -203,16 +203,6 @@
-       cd .. \
-         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
--# The dependency for intlh.inst is different in gettext and all other
--# packages.  Because we cannot you GNU make features we have to solve
--# the problem while rewriting Makefile.in.
--@GT_YES@intlh.inst: intlh.inst.in ../config.status
--@GT_YES@      cd .. \
--@GT_YES@      && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
--@GT_YES@        $(SHELL) ./config.status
--@GT_NO@.PHONY: intlh.inst
--@GT_NO@intlh.inst:
--
- # Tell versions [3.59,3.63) of GNU make not to export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:

diff --git a/lgeneral.desktop b/lgeneral.desktop
deleted file mode 100644 (file)
index 44246ed..0000000
--- a/lgeneral.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=LGeneral
-Comment=Panzer General clone
-Comment[pl]=Klon gry Panzer General
-Exec=lgeneral
-Icon=lgeneral
-Terminal=false
-Type=Application
-Categories=Game;StrategyGame;
-# vi: encoding=utf-8

diff --git a/lgeneral.spec b/lgeneral.spec
index 4d1b72a24153ad8bab51457f78152472e3d2201b..2865ac5f5f89f97bda2e5c6915d42985804b06a3 100644 (file)
--- a/lgeneral.spec
+++ b/lgeneral.spec
@@ -1,15 +1,14 @@
 Summary:       Panzer General clone
 Summary(pl.UTF-8):     Klon gry Panzer General
 Name:          lgeneral
-Version:       1.2.2
+Version:       1.3.1
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Games/Strategy
 Source0:       http://downloads.sourceforge.net/lgeneral/%{name}-%{version}.tar.gz
-# Source0-md5: aa2a591a2f069a4dae530ff6920303cb
-Source1:       %{name}.desktop
-Patch0:                %{name}-hash.patch
-Patch1:                %{name}-format.patch
+# Source0-md5: 7605ccf7eac6ce7a8c36b6db0613ceb6
+Patch0:                %{name}-desktop.patch
+Patch1:                %{name}-hash.patch
 URL:           http://lgames.sourceforge.net/LGeneral
 BuildRequires: SDL-devel >= 1.1.4
 BuildRequires: SDL_mixer-devel
@@ -36,8 +35,8 @@ opcji jak na przykład wpływ pogody na warunki walki.
 
 %prep
 %setup -q
-#patch0 -p1 # if using updated intl/
-%patch1 -p1
+%patch0 -p1
+#patch1 -p1 # if using updated intl/
 
 %{__sed} -i 's@games/@@' configure.in
 
@@ -54,14 +53,10 @@ cp -f %{_datadir}/gettext/config.rpath .
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
-%{__mv} $RPM_BUILD_ROOT%{_iconsdir}/{lgeneral48.png,lgeneral.png}
-
 # lgeneral,pg domains
 %find_lang %{name} --all-name
 
@@ -88,7 +83,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog PanzerGeneral-Guru.txt README.{lgc-pg,lgeneral} TODO
+%doc AUTHORS ChangeLog README.{lgc-pg,lgeneral} TODO
 %attr(755,root,root) %{_bindir}/lgc-pg
 %attr(755,root,root) %{_bindir}/lged
 %attr(755,root,root) %{_bindir}/lgeneral
@@ -109,7 +104,7 @@ fi
 %dir %{_datadir}/lgeneral/themes
 %{_datadir}/lgeneral/themes/default
 %dir %{_datadir}/lgeneral/units
-%{_desktopdir}/%{name}.desktop
+%{_desktopdir}/lgeneral.desktop
 %{_mandir}/man1/lgc-pg.1*
 %{_mandir}/man6/lgeneral.6*
-%{_iconsdir}/%{name}.png
+%{_iconsdir}/hicolor/48x48/apps/lgeneral.png