- more macros,

- summarized %changelog,
- revision up to 2.

Changed files:
    freeciv.spec -> 1.18

diff --git a/freeciv.spec b/freeciv.spec
index c6299a90eddebb7f2435448eb1f461496424e661..becd0826a7df21a02b1de627ae09097ff0c04851 100644 (file)
--- a/freeciv.spec
+++ b/freeciv.spec
@@ -2,7 +2,7 @@ Summary:        FREE CIVilization clone
 Summary(pl):   Niekomercyjny klon CIVilization
 Name:          freeciv
 Version:       1.8.0
-Release:       1
+Release:       2
 Copyright:     GPL
 Group:         X11/Games/Strategy
 Group(pl):     X11/Gry/Strategiczne
@@ -14,6 +14,8 @@ BuildPrereq:  XFree86-devel
 URL:           http://www.freeciv.org/
 Buildroot:     /tmp/%{name}-%{version}-root
 
+%define _prefix /usr/X11R6
+
 %description
 Free clone of Sid Meiers Civilization. Free Civilization clone for unix and
 X. This is multiplayer strategic game and you can also play against
@@ -30,18 +32,18 @@ poprzez sie
 %build
 CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
 ./configure %{_target} \
-       --prefix=/usr/X11R6 \
+       --prefix=%{_prefix} \
        --with-xaw3d
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{etc/X11/wmconfig,usr/X11R6/lib/X11/app-defaults}
+install -d $RPM_BUILD_ROOT{/etc/X11/wmconfig,%{_libdir}/X11/app-defaults}
 
-make install prefix=$RPM_BUILD_ROOT/usr/X11R6
+make install prefix=$RPM_BUILD_ROOT%{_prefix}
 
-mv $RPM_BUILD_ROOT/usr/X11R6/share/freeciv/Freeciv \
-$RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults
+mv $RPM_BUILD_ROOT%{_datadir}/freeciv/Freeciv \
+$RPM_BUILD_ROOT%{_libdir}/X11/app-defaults
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/wmconfig/freeciv-client
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/wmconfig/freeciv-server
@@ -50,88 +52,15 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/wmconfig/freeciv-server
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(644,root,root,755)
+%defattr(644, root, root, 755)
 %doc AUTHORS README freeciv_hackers_guide.txt
 %doc HOWTOPLAY NEWS 
 /etc/X11/wmconfig/*
-%attr(755,root,root) /usr/X11R6/bin/*
-/usr/X11R6/share/freeciv
-/usr/X11R6/lib/X11/app-defaults/Freeciv
+%attr(755, root, root) %{_bindir}/*
+%{_datadir}/freeciv
+%{_libdir}/X11/app-defaults/Freeciv
 
 %changelog
-* Sun Apr 11 1999 Jacek Konieczny <jajcus@zeus.polsl.gliwice.pl?
-  [1.8.0pre3-1]
-- NEWS instead of ChangeLog goes to %doc
-- New version
-
-* Tue Jan 26 1999 Micha³ Kuratczyk <kurkens@polbox.com>
-- added "Group(pl)"
-
-* Wed Dec 23 1998 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [1.7.2-1]
-- removed all patches,
-- simplification in %files,
-- added --with-xaw3d to confirgure parameters.
-
-* Wed Dec 23 1998 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [1.7.1-2]
-- added using LDFLAGS="-s" to ./configure enviroment,
-- added patch from freeciv contrib for using Xaw3d library instead Xaw.
-
-* Sat Aug 22 1998 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [1.7.0-2]
-- removed CHANGES from %doc,
-- fixed some bugs in pl translation.
-
-* Thu Aug  6 1998 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [1.7.0-1]
-- added -q %setup parameter,
-- added pl translation,
-- updated URL and %description (now ypu can play against AI players).
-
-* Sun Jun  7 1998 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [1.6.2-1]
-- adde AUTHORS, ChangeLog, freeciv_hackers_guide.txt, HOWTOPLAY, ChangeLog
-  to %doc,
-- added use %{SOURCE#} in %install,
-- fixed typo in wmconfig file for freeciv srv console,
-- wmconfig entries for freeciv, freeciv srv console moved to Games/Strategy,
-- added all modification for building freeciv with using GNU autoconf.
-
-* Mon May 11 1998 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [1.5.4-2]
-- changed Source url,
-- now freeciv is builded from tar.bz2,
-- added temporary hack (Source2 field) rpm 2.4.109 bug wihch can't include
-  Icon file in src.rpm.
-
-* Fri May  1 1998 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [1.5.4-1]
-- added title in xterm with FC server console in wmconfig registration file,
-- %%{version} macro instead %%{PACKAGE_VERSION},
-- added using %%{name} macro in Buildroot,
-- added -q parametr for %setup.
-
-* Sun Apr 26 1998 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [1.5.3-1]
-- added %clean section,
-- added using %defattr macro (require rpm >= 2.4.99),
-- updated URL,
-- added wmconfig registration file for freeciv client and server console,
-- all data moved to /usr/X11R6/share/freeciv,
-- removed Packager field from spec (if you want recompile package and
-  redistribute this package later put this in your private .rpmrc).
-- changed %build procedure (using xmkmf),
-- added CDEBUGFLAGS="$RPM_OPT_FLAGS" make option.
-
-* Sun Sep 21 1997 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [1.0k-1]
-- changed %attr on %doc to (-,root,root)
-
-* Sat Aug  9 1997 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [1.0j-1]
-- new version 1.0j,
-- all rewritetd for using Buildroot,
-- added:
-  - URL,
-  - %attr macros in %file (allows build package from non root account).
+* Mon May 31 1999 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
+  [1.8.0-2]
+- spec writed by PLD team (based on my old spec for freeciv).