Author: arvenil Date: Thu Jun 24 07:22:41 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- R: java-commons-cli
- *.jar moved to %{_javadir}
- partial release 1.1; still doesn't work
because of missing miglayout (thanks lisu)
- cleanup
---- Files affected:
packages/freecol:
freecol.spec (1.25 -> 1.26) , freecol.sh (1.3 -> 1.4)
---- Diffs:
================================================================
Index: packages/freecol/freecol.spec
diff -u packages/freecol/freecol.spec:1.25 packages/freecol/freecol.spec:1.26
--- packages/freecol/freecol.spec:1.25 Sun Jun 20 16:17:13 2010
+++ packages/freecol/freecol.spec Thu Jun 24 09:22:36 2010
@@ -4,7 +4,7 @@
Summary(pl.UTF-8): Klon gry Colonization o otwartych źródłach
Name: freecol
Version: 0.9.3
-Release: 1
+Release: 1.1
License: GPL v2+
Group: X11/Applications/Games
Source0:
http://downloads.sourceforge.net/freecol/%{name}-%{version}-src.tar.gz
@@ -19,10 +19,10 @@
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
Requires: higlayout
+Requires: java-commons-cli
Requires: jre >= 1.4
Requires: jre-X11
BuildArch: noarch
-# list arches that can fill higlayout dependency
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -44,9 +44,9 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d
$RPM_BUILD_ROOT{%{_bindir},%{_datadir}/freecol,%{_desktopdir},%{_pixmapsdir}}
+install -d
$RPM_BUILD_ROOT{%{_bindir},%{_datadir}/freecol,%{_desktopdir},%{_pixmapsdir},%{_javadir}}
-install FreeCol.jar $RPM_BUILD_ROOT%{_datadir}/freecol/FreeCol.jar
+install FreeCol.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
install %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/freecol
cp -a data/* $RPM_BUILD_ROOT%{_datadir}/freecol/
@@ -61,6 +61,7 @@
%doc README
%attr(755,root,root) %{_bindir}/freecol
%{_datadir}/freecol
+%{_javadir}/%{name}.jar
%{_desktopdir}/%{name}.desktop
%{_pixmapsdir}/%{name}.xpm
@@ -70,6 +71,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.26 2010/06/24 07:22:36 arvenil
+- R: java-commons-cli
+- *.jar moved to %{_javadir}
+- partial release 1.1; still doesn't work
+ because of missing miglayout (thanks lisu)
+- cleanup
+
Revision 1.25 2010/06/20 14:17:13 arvenil
- up to 0.9.3
================================================================
Index: packages/freecol/freecol.sh
diff -u packages/freecol/freecol.sh:1.3 packages/freecol/freecol.sh:1.4
--- packages/freecol/freecol.sh:1.3 Wed Nov 21 16:11:28 2007
+++ packages/freecol/freecol.sh Thu Jun 24 09:22:36 2010
@@ -8,8 +8,7 @@
fi
MAIN_CLASS="net.sf.freecol.FreeCol"
-CLASSPATH="/usr/share/freecol/FreeCol.jar"
-BASE_JARS="higlayout"
+BASE_JARS="freecol commons-cli higlayout"
BASE_FLAGS="-Xmx256M"
set_jvm
@@ -17,4 +16,4 @@
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
-run $@ --freecol-data /usr/share/freecol
+run --freecol-data /usr/share/freecol "$@"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/freecol/freecol.spec?r1=1.25&r2=1.26&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/freecol/freecol.sh?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
