rpms/freeciv/devel freeciv.spec,1.2,1.3

[Brian Pepple (bpepple)]

Author: bpepple

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

Modified Files:
	freeciv.spec 
Log Message:
minor spec file changes


Index: freeciv.spec
===================================================================
RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freeciv.spec	24 Mar 2005 01:39:40 -0000	1.2
+++ freeciv.spec	26 Mar 2005 14:52:21 -0000	1.3
@@ -1,12 +1,9 @@
 %define desktop_file 1
-%if %{desktop_file}
-%define desktop_file_utils_version 0.2.93
-%endif
 
 Name:		freeciv
 Version:	1.14.2
-Release:	5
-Summary: 	The Freeciv multi-player strategy game
+Release:	6
+Summary:	The Freeciv multi-player strategy game
 
 Group:		Amusements/Games
 License:	GPL
@@ -15,15 +12,15 @@
 Source1:	freeciv-desktop.tar.bz2
 Source2:	http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz
 Source3:	NEWS-1.14.2
-Patch1:         freeciv-desktop.patch
+Patch1:		freeciv-desktop.patch
 Patch2:		freeciv-desktop-xauth.patch
 Patch3:		freeciv-1.13.0-aifill.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildPrereq:	gtk2-devel >= 2.0.5 imlib-devel
+BuildRequires:	gtk2-devel
+BuildRequires:	imlib-devel
 %if %{desktop_file}
-Requires: 	/usr/bin/desktop-file-install
-BuildPrereq: 	desktop-file-utils >= %{desktop_file_utils_version}
+BuildRequires:	desktop-file-utils
 %endif
 
 %description
@@ -53,24 +50,24 @@
 
 %makeinstall
 chmod +x desktop/*wrapper
-cp desktop/*wrapper $RPM_BUILD_ROOT/usr/bin
-mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Games $RPM_BUILD_ROOT/usr/share/pixmaps
+cp desktop/*wrapper $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Games $RPM_BUILD_ROOT%{_datadir}/pixmaps
 cp desktop/*.desktop $RPM_BUILD_ROOT/etc/X11/applnk/Games
 
 %if %{desktop_file}
-mkdir -p $RPM_BUILD_ROOT/usr/share/applications
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor net \
-        --dir $RPM_BUILD_ROOT/usr/share/applications \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
         --add-category "Application;Game;X-Fedora" \
         $RPM_BUILD_ROOT/etc/X11/applnk/Games/freeciv-client.desktop
 desktop-file-install --vendor net \
-        --dir $RPM_BUILD_ROOT/usr/share/applications \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
         --add-category "Application;Game;X-Fedora" \
         $RPM_BUILD_ROOT/etc/X11/applnk/Games/freeciv-server.desktop
 rm $RPM_BUILD_ROOT/etc/X11/applnk/Games/*.desktop
 %endif
 
-cp desktop/*.xpm $RPM_BUILD_ROOT/usr/share/pixmaps
+cp desktop/*.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
 pushd client
 perl -p -i -e "s/CFLAGS = $RPM_OPT_FLAGS/CFLAGS = $RPM_OPT_FLAGS \`gtk-config --cflags\`/" gui-gtk/Makefile
@@ -81,18 +78,18 @@
   perl -p -i -e "s|-lXaw3d|\`glib-config --libs\` \`gtk-config --libs\` \`imlib-config --libs-gdk\`|" Makefile
 done
 make
-cp civclient $RPM_BUILD_ROOT/usr/bin/civclient-gtk
+cp civclient $RPM_BUILD_ROOT%{_bindir}/civclient-gtk
 popd
 
-/usr/bin/install -c civ  $RPM_BUILD_ROOT/usr/bin/civ
+/usr/bin/install -c civ  $RPM_BUILD_ROOT%{_bindir}/civ
 
 /usr/bin/install -d $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults
-mv $RPM_BUILD_ROOT/usr/share/freeciv/Freeciv $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults/Freeciv
+mv $RPM_BUILD_ROOT%{_datadir}/freeciv/Freeciv $RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults/Freeciv
 
-mv $RPM_BUILD_ROOT/usr/bin/civclient $RPM_BUILD_ROOT/usr/bin/civclient-xaw
-ln -sf civclient-gtk $RPM_BUILD_ROOT/usr/bin/civclient
+mv $RPM_BUILD_ROOT%{_bindata}/civclient $RPM_BUILD_ROOT{%_bindir}/civclient-xaw
+ln -sf civclient-gtk $RPM_BUILD_ROOT%{_bindir}/civclient
 
-(cd $RPM_BUILD_ROOT/usr/share/freeciv; tar xzf %{SOURCE2}; )
+(cd $RPM_BUILD_ROOT%{_datadir}/freeciv; tar xzf %{SOURCE2}; )
 
 %find_lang %name
 
@@ -102,7 +99,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %if %{desktop_file}
-%config /usr/share/applications/*
+%config %{_datadir}/applications/*
 %doc NEWS*
 %else
 %config /etc/X11/applnk/Games/*
@@ -114,6 +111,11 @@
 
 
 %changelog
+* Sat Mar 26 2005 Brian Pepple <bdpepple at ameritech.net> - 1.14.2-6
+- Added more macros.
+- Replaced BuildPrereq with BuildRequires.
+- Drop version of gtk2-devel, since FC3 & later meet minimum needed.
+
 * Wed Mar 23 2005 Brian Pepple <bdpepple at ameritech.net> - 1.14.2-5
 - Changed X-Red-Hat-Extra to X-Fedora.
 - Added URL.