[lincity-ng] 2.9 beta

Tom Callaway spot at fedoraproject.org
Mon Dec 30 21:51:18 UTC 2013


commit 437ef4ebabb858a48bde5ed624c511767d3b8541
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Mon Dec 30 16:51:14 2013 -0500

    2.9 beta

 .gitignore      |    1 +
 lincity-ng.spec |   22 ++++++++--------------
 sources         |    2 +-
 3 files changed, 10 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 68446ba..933630d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 lincity-ng-2.0.tar.bz2
+/lincity-ng-2.9.beta.tar.bz2
diff --git a/lincity-ng.spec b/lincity-ng.spec
index c9ba3b4..a5b7ed3 100644
--- a/lincity-ng.spec
+++ b/lincity-ng.spec
@@ -1,15 +1,14 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+%global prever beta
 
 Name:		lincity-ng
-Version:	2.0
-Release:	14%{?dist}
+Version:	2.9
+Release:	0.1.%{prever}%{?dist}
 License:	GPLv2+
 Group:		Amusements/Games
 Summary:	City Simulation Game
 URL:		http://lincity-ng.berlios.de/
-Source0:	http://download.berlios.de/lincity-ng/lincity-ng-%{version}.tar.bz2
-Patch0:		lincity-ng-2.0-format-security-fixes.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:	http://prdownload.berlios.de/lincity-ng/lincity-ng-%{version}.%{prever}.tar.bz2
 BuildRequires:	jam, physfs-devel, zlib-devel, libxml2-devel
 BuildRequires:	SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_gfx-devel
 BuildRequires:	SDL_ttf-devel, desktop-file-utils
@@ -35,8 +34,7 @@ This package contains the data files (graphics, models, audio) necessary to
 play Lincity-NG.
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .format-security
+%setup -q -n %{name}-%{version}.%{prever}
 sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules
 sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules
 sed -i 's|lincity-ng.png|lincity-ng|g' lincity-ng.desktop
@@ -46,7 +44,6 @@ sed -i 's|lincity-ng.png|lincity-ng|g' lincity-ng.desktop
 jam
 
 %install
-rm -rf $RPM_BUILD_ROOT
 DESTDIR=$RPM_BUILD_ROOT jam -sappdocdir=%{_pkgdocdir} install
 
 # Make a symlink to system font, rather than include a copy of DejaVu Sans
@@ -56,24 +53,21 @@ ln -s %{_datadir}/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/%{name}
 desktop-file-install --delete-original		\
   --dir $RPM_BUILD_ROOT%{_datadir}/applications	\
   --mode 0644					\
-  --add-category X-Fedora			\
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc %{_pkgdocdir}
 %{_bindir}/lincity-ng
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*lincity-ng.desktop
 
 %files data
-%defattr(-,root,root,-)
 %{_datadir}/lincity-ng/
 
 %changelog
+* Mon Dec 30 2013 Tom Callaway <spot at fedoraproject.org> - 2.9-0.1.beta
+- update to 2.9.beta
+
 * Tue Dec  3 2013 Tom Callaway <spot at fedoraproject.org> - 2.0-14
 - fix format-security issues
 
diff --git a/sources b/sources
index 5ebb1c0..a27e9c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1bd0f58e0f2b131d70044f4230600ed1  lincity-ng-2.0.tar.bz2
+f1bd80dfda273bb168d26fc7c74fcfbc  lincity-ng-2.9.beta.tar.bz2


More information about the scm-commits mailing list