Author: lisu Date: Fri Nov 30 19:50:43 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - 2.1.1 - use .desktop files and icons provided by project (-desktop.patch)
---- Files affected: SPECS: freeciv.spec (1.104 -> 1.105) ---- Diffs: ================================================================ Index: SPECS/freeciv.spec diff -u SPECS/freeciv.spec:1.104 SPECS/freeciv.spec:1.105 --- SPECS/freeciv.spec:1.104 Tue Nov 27 01:20:45 2007 +++ SPECS/freeciv.spec Fri Nov 30 20:50:38 2007 @@ -2,7 +2,6 @@ # # TODO # - dozen of unpackaged files -# - consider using desktop file included with project (for clinet icon presentation) # # Conditional build: %bcond_without gtk2 # build gtk1 client, not gtk2 @@ -12,20 +11,18 @@ Summary(pl.UTF-8): Niekomercyjny klon CIVilization Summary(pt_BR.UTF-8): Clone do jogo Civilization Name: freeciv -Version: 2.1.0 +Version: 2.1.1 Release: 0.1 License: GPL v2+ Group: X11/Applications/Games/Strategy Source0: http://dl.sourceforge.net/freeciv/%{name}-%{version}.tar.bz2 -# Source0-md5: f640aa48abca0a235220d6df22b9bc82 +# Source0-md5: cbbe72822d6698d9a66db2f383e2a421 Source1: ftp://ftp.freeciv.org/pub/freeciv/contrib/audio/soundsets/stdsounds3.tar.gz # Source1-md5: 77215914712f2f351092918f5e41e39e Source2: ftp://ftp.freeciv.org/pub/freeciv/contrib/tilesets/freeland/freeland-normal-2.0.0.tar.gz # Source2-md5: c9f061fca82aa50a19fbbc89c06ff81d -Source3: %{name}-client.desktop -Source4: %{name}-server.desktop -Source5: %{name}.png Patch0: %{name}-link.patch +Patch1: %{name}-desktop.patch URL: http://www.freeciv.org/ BuildRequires: SDL_mixer-devel BuildRequires: autoconf >= 2.52 @@ -88,6 +85,7 @@ %prep %setup -q -a1 -a2 %patch0 -p1 +%patch1 -p1 %build %{__aclocal} @@ -107,9 +105,9 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -install %{SOURCE3} %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir} -install %{SOURCE5} $RPM_BUILD_ROOT%{_pixmapsdir} - +cp -f client/%{name}.desktop $RPM_BUILD_ROOT%{_desktopdir}/%{name}-client.desktop +cp -f server/%{name}-server.desktop $RPM_BUILD_ROOT%{_desktopdir} +cp -f data/icons/32x32/*.png $RPM_BUILD_ROOT%{_pixmapsdir} cp -rf data/stdsounds{,.soundspec} $RPM_BUILD_ROOT%{_datadir}/%{name} cp -f freeland.tilespec $RPM_BUILD_ROOT%{_datadir}/%{name} cp -rf freeland $RPM_BUILD_ROOT%{_datadir}/%{name} @@ -163,6 +161,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.105 2007-11-30 19:50:38 lisu +- 2.1.1 +- use .desktop files and icons provided by project (-desktop.patch) + Revision 1.104 2007-11-27 00:20:45 lisu - proper and complete merge with DEVEL - fix commit log ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/freeciv.spec?r1=1.104&r2=1.105&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
