X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=freecol.spec;h=fa85c6f0068f81e3149327c6b33a98ac5a82ec9d;hb=e1d87a5a7fa4af3bcd05a98edeb58997bc6f398b;hp=a485861c10fe41231f18b85963acfb39437128cc;hpb=76b18c54fed16e2d67b78800b27facff53cd4897;p=packages%2Ffreecol.git

diff --git a/freecol.spec b/freecol.spec
index a485861..fa85c6f 100644
--- a/freecol.spec
+++ b/freecol.spec
@@ -1,21 +1,28 @@
+%include	/usr/lib/rpm/macros.java
 Summary:	Open source Colonization clone
-Summary(pl):	Klon gry Colonization o otwartych ¼ród³ach
+Summary(pl.UTF-8):	Klon gry Colonization o otwartych źródłach
 Name:		freecol
-Version:	0.5.0
+Version:	0.9.4
 Release:	0.1
-License:	GPL v2
+License:	GPL v2+
 Group:		X11/Applications/Games
-Source0:	http://dl.sourceforge.net/freecol/%{name}-%{version}-src.tar.gz
-# Source0-md5:	fa33b91c291665dc94382afcfc4be69a
+Source0:	http://downloads.sourceforge.net/freecol/%{name}-%{version}-src.tar.gz
+# Source0-md5:	f0c0f5f2ce22a825a3182bf0ac23c9a8
 Source1:	%{name}.sh
+Source2:	%{name}.desktop
 URL:		http://www.freecol.org/
-BuildRequires:	ant
 BuildRequires:	ant-nodeps
 BuildRequires:	higlayout
 BuildRequires:	jdk >= 1.4
+BuildRequires:	jpackage-utils
+BuildRequires:	miglayout
+BuildRequires:	rpm-javaprov
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	higlayout
+Requires:	java-commons-cli
 Requires:	jre >= 1.4
 Requires:	jre-X11
+Requires:	miglayout
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -23,26 +30,33 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 The FreeCol team aims to create an Open Source version of Colonization
 (released under the GPL).
 
-%description -l pl
-Celem zespo³y FreeCol jest stworzenie otwartej wersji gry Colonization
+%description -l pl.UTF-8
+Celem zespołu FreeCol jest stworzenie otwartej wersji gry Colonization
 (wydanej na licencji GPL).
 
 %prep
 %setup -q -n %{name}
-#rm -rf jars
-#sed -i -e /Class-Path/d src/MANIFEST.MF
 
 %build
-CLASSPATH=$(build-classpath higlayout)
-JAVA_HOME=%{java_home}
-export CLASSPATH JAVA_HOME
-%ant -Dnojars -Dnodata fullpackage
+required_jars="higlayout miglayout-swing"
+export CLASSPATH=$(build-classpath $required_jars)
+%ant
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 644 FreeCol.jar \
-	$RPM_BUILD_ROOT%{_datadir}/games/freecol/FreeCol.jar
-install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/freecol
+
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/freecol,%{_desktopdir},%{_pixmapsdir},%{_javadir}}
+
+install FreeCol.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/freecol
+
+# install freecol specific cortado library
+install jars/cortado-fc-1.0.jar $RPM_BUILD_ROOT%{_javadir}/
+ln -s  cortado-fc-1.0.jar $RPM_BUILD_ROOT%{_javadir}/cortado-fc.jar
+
+cp -a data/* $RPM_BUILD_ROOT%{_datadir}/freecol/
+install %SOURCE2 $RPM_BUILD_ROOT%{_desktopdir}
+install %{name}.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -51,4 +65,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README
 %attr(755,root,root) %{_bindir}/freecol
-%{_datadir}/games/freecol
+%{_datadir}/freecol
+%{_javadir}/%{name}.jar
+%{_javadir}/cortado-fc*.jar
+%{_desktopdir}/%{name}.desktop
+%{_pixmapsdir}/%{name}.xpm