Author: peroyvind
Date: Sun Feb 18 16:07:58 2007
New Revision: 122382
Added:
packages/cooker/freeciv/current/SOURCES/freeciv-2.0.9-configure_ac_localedir.patch
packages/cooker/freeciv/current/SOURCES/freeciv-2.0.9.tar.bz2 (contents,
props changed)
Removed:
packages/cooker/freeciv/current/SOURCES/freeciv-2.0.1-rc1-configure_ac_localedir.patch.bz2
packages/cooker/freeciv/current/SOURCES/freeciv-2.0.8.tar.bz2
Modified:
packages/cooker/freeciv/current/SPECS/freeciv.spec
Log:
2.0.9
- regenerate P0
Added:
packages/cooker/freeciv/current/SOURCES/freeciv-2.0.9-configure_ac_localedir.patch
==============================================================================
--- (empty file)
+++
packages/cooker/freeciv/current/SOURCES/freeciv-2.0.9-configure_ac_localedir.patch
Sun Feb 18 16:07:58 2007
@@ -0,0 +1,22 @@
+--- freeciv-2.0.9/configure.locale 2007-02-12 00:37:29.000000000 +0100
++++ freeciv-2.0.9/configure 2007-02-18 15:59:55.000000000 +0100
+@@ -9544,7 +9544,7 @@ fi
+ fi
+
+
+-CPPFLAGS="$CFLAGS -DLOCALEDIR=\"\\\"$datadir/locale\\\"\""
++CPPFLAGS="$CFLAGS -DLOCALEDIR=\"\\\"$prefix/data/locale\\\"\""
+
+ EXTRA_GCC_DEBUG_CFLAGS=""
+
+--- freeciv-2.0.9/configure.ac.locale 2007-02-10 03:06:09.000000000 +0100
++++ freeciv-2.0.9/configure.ac 2007-02-18 16:00:07.000000000 +0100
+@@ -269,7 +269,7 @@ fi
+
+
+ dnl note this has to match the path installed by po/Makefile
+-CPPFLAGS="$CFLAGS -DLOCALEDIR=\"\\\"$datadir/locale\\\"\""
++CPPFLAGS="$CFLAGS -DLOCALEDIR=\"\\\"$prefix/data/locale\\\"\""
+
+ EXTRA_GCC_DEBUG_CFLAGS=""
+
Added: packages/cooker/freeciv/current/SOURCES/freeciv-2.0.9.tar.bz2
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/freeciv/current/SPECS/freeciv.spec
==============================================================================
--- packages/cooker/freeciv/current/SPECS/freeciv.spec (original)
+++ packages/cooker/freeciv/current/SPECS/freeciv.spec Sun Feb 18 16:07:58 2007
@@ -1,6 +1,6 @@
%define name freeciv
-%define version 2.0.8
-%define rel 5
+%define version 2.0.9
+%define rel 1
%define release %mkrel %{rel}
Name: %{name}
@@ -17,7 +17,7 @@
Source20: %{name}-server.16.png
Source21: %{name}-server.32.png
Source22: %{name}-server.48.png
-Patch0: freeciv-2.0.1-rc1-configure_ac_localedir.patch.bz2
+Patch0: freeciv-2.0.9-configure_ac_localedir.patch
Patch1: freeciv-1.14.1-caravan-show-shields.patch.bz2
Patch2: freeciv-2.0.8-fix-icon.patch
License: GPL
@@ -85,28 +85,26 @@
%make
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%makeinstall_std localedir=%{_datadir}/locale
-tar -jxf %{SOURCE2} -C $RPM_BUILD_ROOT%{_gamesdatadir}/%{name}
-# install -d $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults
-# install -m 644 data/Freeciv
$RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults/Freeciv
+tar -jxf %{SOURCE2} -C %{buildroot}%{_gamesdatadir}/%{name}
# icons
-install -m644 %{SOURCE10} -D $RPM_BUILD_ROOT%{_miconsdir}/%{name}-client.png
-install -m644 %{SOURCE11} -D $RPM_BUILD_ROOT%{_iconsdir}/%{name}-client.png
-install -m644 %{SOURCE12} -D $RPM_BUILD_ROOT%{_liconsdir}/%{name}-client.png
-install -m644 %{SOURCE20} -D $RPM_BUILD_ROOT%{_miconsdir}/%{name}-server.png
-install -m644 %{SOURCE21} -D $RPM_BUILD_ROOT%{_iconsdir}/%{name}-server.png
-install -m644 %{SOURCE22} -D $RPM_BUILD_ROOT%{_liconsdir}/%{name}-server.png
+install -m644 %{SOURCE10} -D %{buildroot}%{_miconsdir}/%{name}-client.png
+install -m644 %{SOURCE11} -D %{buildroot}%{_iconsdir}/%{name}-client.png
+install -m644 %{SOURCE12} -D %{buildroot}%{_liconsdir}/%{name}-client.png
+install -m644 %{SOURCE20} -D %{buildroot}%{_miconsdir}/%{name}-server.png
+install -m644 %{SOURCE21} -D %{buildroot}%{_iconsdir}/%{name}-server.png
+install -m644 %{SOURCE22} -D %{buildroot}%{_liconsdir}/%{name}-server.png
# wrapper
-mv $RPM_BUILD_ROOT%{_gamesbindir}/civserver
$RPM_BUILD_ROOT%{_gamesbindir}/civserver.real
-bzcat %{SOURCE1} > $RPM_BUILD_ROOT%{_gamesbindir}/civserver
+mv %{buildroot}%{_gamesbindir}/civserver
%{buildroot}%{_gamesbindir}/civserver.real
+bzcat %{SOURCE1} > %{buildroot}%{_gamesbindir}/civserver
# menu entry
-mkdir -p $RPM_BUILD_ROOT%{_menudir}
-cat >$RPM_BUILD_ROOT%{_menudir}/%{name}-client <<EOF
+mkdir -p %{buildroot}%{_menudir}
+cat > %{buildroot}%{_menudir}/%{name}-client <<EOF
?package(%{name}-client):\
needs="x11"\
section="More Applications/Games/Strategy"\
@@ -124,9 +122,9 @@
--add-category="GTK" \
--add-category="Game;StrategyGame" \
--add-category="X-MandrivaLinux-MoreApplications-Games-Strategy" \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications
$RPM_BUILD_ROOT%{_datadir}/applications/*
+ --dir %{buildroot}%{_datadir}/applications
%{buildroot}%{_datadir}/applications/*
-cat >$RPM_BUILD_ROOT%{_menudir}/%{name}-server <<EOF
+cat > %{buildroot}%{_menudir}/%{name}-server <<EOF
?package(%{name}-server):\
needs="text"\
section="More Applications/Games/Strategy"\
@@ -137,8 +135,8 @@
xdg="true"
EOF
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-cat > $RPM_BUILD_ROOT%{_datadir}/applications/mandriva-%{name}-server.desktop
<< EOF
+mkdir -p %{buildroot}%{_datadir}/applications
+cat > %{buildroot}%{_datadir}/applications/mandriva-%{name}-server.desktop <<
EOF
[Desktop Entry]
Name=%{name}-server
Comment=The Free Civilization Clone (server)
@@ -152,7 +150,7 @@
%find_lang %{name}
-install -m644 %{name}.bash-completion -D
$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/%{name}
+install -m644 %{name}.bash-completion -D
%{buildroot}%{_sysconfdir}/bash_completion.d/%{name}
%post client
%update_menus
@@ -167,7 +165,7 @@
%clean_menus
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files -f %{name}.lang data
%defattr(644,root,root,0755)
@@ -175,7 +173,6 @@
%defattr(644,root,games,0755)
%{_gamesdatadir}/%{name}
%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name}
-# /usr/X11R6/lib/X11/app-defaults/Freeciv
%files client
%defattr(755,root,games,0755)
