- bit updated, NFY, but builds and its playable

Changed files:
    freecivac.spec -> 1.5

diff --git a/freecivac.spec b/freecivac.spec
index b98874686c0fc9e46ab01997730db413409b1fc2..51c39ba5ce35fbf7ba0cde9fff584d0e3c18040f 100644 (file)
--- a/freecivac.spec
+++ b/freecivac.spec
@@ -1,18 +1,23 @@
 #
+# TODO: 
+#  - fix app name (files are freeciv.mo and so on, so conflicts with freeciv)
 # Conditional build:
-
+%define        snapdate 20050502
 Summary:       FREE CIVilization clone - AC version
 Summary(pl):   Klon FREE CIVilization - wersja AC
 Name:          freecivac
-Version:       cvs20040405
-Release:       0
+Version:       snap.%{snapdate}
+Release:       0.1
 License:       GPL
 Group:         X11/Applications/Games/Strategy
-Source0:       %{name}-%{version}.tgz
+Source0:       %{name}-snap-%{snapdate}.tgz
+Patch0:                %{name}-gtk2-m4.diff
 URL:           http://freecivac.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+# needs to be resolved, mo and /usr/share/freeciv conflict
+Conflicts:     freeciv
 
 %define                _appdefsdir     /usr/X11R6/lib/X11/app-defaults
 
@@ -22,45 +27,56 @@ unix and X. This is multiplayer strategic game and you can also play
 against computer-AI players.
 
 %description -l pl
-Darmowy klon Civilization Sida Meiera, dzia³aj±cy pod Uniksem i X.
-Jest to gra strategiczna dla wielu graczy, mo¿na graæ tak¿e przeciwko
+Darmowy klon Civilization Sida Meiera, działający pod Uniksem i X.
+Jest to gra strategiczna dla wielu graczy, można grać także przeciwko
 komputerowej AI.
 
+# yes, i know ugly way, but i wanted to commit what i done @home maybe
+# somebody else could fix rest, 
 %prep
 %setup -q -n %{name}
+%patch0 -p1
+rm configure.in
+mv m4/x.252 m4/x.m4
+perl -pi -e 's/-lslang-utf8/-lslang/' server/Makefile.am
+perl -pi -e 's/-lslang-utf8/-lslang/' client/Makefile.am
+chmod +x client/gui-gtk-2.0/rc2c
 
 %build
-sh autogen.sh
+#%%{__gettextize}
+#autoupdate
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure
-#%{!?with_gtk2:        --enable-client=gtk} \
-#%{?with_gtk2: --enable-client=gtk2}
 
-%{__make}
+%{__make} \
+       ARFLAGS=rcs
 
 %install
 rm -rf $RPM_BUILD_ROOT
-exit 1
-install -d $RPM_BUILD_ROOT%{_appdefsdir},%{_desktopdir},%{_pixmapsdir}}
-
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm $RPM_BUILD_ROOT%{_datadir}/freeciv/Freeciv
+#install -d $RPM_BUILD_ROOT%{_appdefsdir},%{_desktopdir},%{_pixmapsdir}}
+
+#rm $RPM_BUILD_ROOT%{_datadir}/freeciv/Freeciv
 
-install %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
-install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/freeciv/stdsounds.soundspec
-cp -ar stdsounds $RPM_BUILD_ROOT%{_datadir}/freeciv
+#install %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+#install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
+#install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/freeciv/stdsounds.soundspec
+#cp -ar stdsounds $RPM_BUILD_ROOT%{_datadir}/freeciv
 
-%find_lang %{name}
+%find_lang freeciv 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}.lang
+%files -f freeciv.lang
 %defattr(644,root,root,755)
 %doc AUTHORS README ChangeLog NEWS
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/freeciv
-%{_desktopdir}/*
-%{_pixmapsdir}/*
+#%%{_desktopdir}/*
+#%%{_pixmapsdir}/*