rpms/nazghul/F-12 nazghul-make-snapshot, NONE, 1.1 nazghul.spec, 1.24, 1.25 sources, 1.10, 1.11
Jason ティビツ
tibbs at fedoraproject.org
Tue Sep 29 11:32:25 UTC 2009
Author: tibbs
Update of /cvs/extras/rpms/nazghul/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4000
Modified Files:
nazghul.spec sources
Added Files:
nazghul-make-snapshot
Log Message:
* Tue Sep 29 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.4.20090928cvs
- Pull latest fixes.
* Tue Sep 22 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.3.20090918cvs
- Modernize the spec a bit; nuke BuildRoot:, no more RPM_BUILD_ROOT.
* Fri Sep 18 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.2.20090918cvs
- New CVS snapshot; hopefully fix x86_64 startup crash and music issues.
* Thu Sep 10 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.1.20090910cvs
- Initial attempt to rebase to current CVS.
- Update to use xz for compression of snapshot tarballs.
- Rename "nazghul-haxima" package to "haxima", according to upstream wishes and
common sense.
--- NEW FILE nazghul-make-snapshot ---
#!/bin/sh
CVSDATE=$1
TMPDIR=$(mktemp -d nazghul.XXXXXXXXXXX) || exit 1
pushd $TMPDIR
cvs -z3 -d:pserver:anonymous at nazghul.cvs.sourceforge.net:/cvsroot/nazghul co -D$CVSDATE nazghul
tar cvvfJ nazghul-$CVSDATE.txz nazghul
popd
mv $TMPDIR/nazghul-$CVSDATE.txz .
rm -rf $TMPDIR
Index: nazghul.spec
===================================================================
RCS file: /cvs/extras/rpms/nazghul/F-12/nazghul.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- nazghul.spec 25 Jul 2009 15:49:00 -0000 1.24
+++ nazghul.spec 29 Sep 2009 11:32:23 -0000 1.25
@@ -1,14 +1,13 @@
-%define cvsdate 20080407
+%define cvsdate 20090928
Name: nazghul
-Version: 0.6.0
-Release: 7.%{cvsdate}cvs%{?dist}
+Version: 0.7.0
+Release: 0.4.%{cvsdate}cvs%{?dist}
Summary: A computer role-playing game (CRPG) engine
Group: Amusements/Games
License: GPLv2+
URL: http://myweb.cableone.net/gmcnutt/nazghul.html
-
# Occasionally upstream names things with an underscore.
%define version_us %(echo %{version} | sed -e 's/\\./_/g')
@@ -16,15 +15,13 @@ URL: http://myweb.cableone.ne
# Construct cvs checkout tarball with:
# cvs -z3 -d:pserver:anonymous at nazghul.cvs.sourceforge.net:/cvsroot/nazghul co -D%{cvsdate} nazghul
-# tar cvvfz nazghul-%{cvsdate}.tgz nazghul
-Source0: nazghul-%{cvsdate}.tgz
+# tar cvvfJ nazghul-%{cvsdate}.txz nazghul
+Source0: nazghul-%{cvsdate}.txz
Patch0: nazghul-desktop.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: SDL_image-devel, SDL_mixer-devel, desktop-file-utils, libpng-devel
-
# For building from a CVS snapshot
BuildRequires: automake, autoconf
+BuildRequires: SDL_image-devel, SDL_mixer-devel, desktop-file-utils, libpng-devel
%description
Nazghul is an old-school RPG engine modeled after those made in the
@@ -32,12 +29,14 @@ heyday of top-down, 2d tile-based graphi
after Ultima V.
-%package haxima
+%package -n haxima
Summary: A full-featured role-playing game for the Nazghul engine
Group: Amusements/Games
Requires: nazghul = %{version}
+Provides: nazghul-haxima = %{version}-%{release}
+Obsoletes: nazghul-haxima < 0.6.0-8
-%description haxima
+%description -n haxima
A complete, playable and full-featured role playing game which runs
under the Nazghul CRPG engine.
@@ -64,26 +63,25 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
-mv $RPM_BUILD_ROOT/%{_bindir}/haxima.sh $RPM_BUILD_ROOT/%{_bindir}/haxima
+mv %{buildroot}/%{_bindir}/haxima.sh %{buildroot}/%{_bindir}/haxima
desktop-file-install --vendor fedora \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+ --dir %{buildroot}/%{_datadir}/applications \
--add-category X-Fedora \
haxima.desktop
-install -D -m 644 icons/haxima.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/haxima.png
+install -D -m 644 icons/haxima.png %{buildroot}/%{_datadir}/pixmaps/haxima.png
# It seems that the music gets left out by "make install"
-pushd %{_builddir}/%{name}/worlds/haxima-1.002
-cp -rp music $RPM_BUILD_ROOT%{_datadir}/nazghul/haxima
-popd
+#pushd %{_builddir}/%{name}/worlds/haxima-1.002
+#cp -rp music %{buildroot}/%{_datadir}/nazghul/haxima
+#popd
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files
@@ -94,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT
%doc MAP_HACKERS_GUIDE engine_extension_and_design world_building
-%files haxima
+%files -n haxima
%defattr(-,root,root,-)
%{_bindir}/haxima
%{_datadir}/nazghul/haxima
@@ -104,6 +102,21 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Sep 29 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.4.20090928cvs
+- Pull latest fixes.
+
+* Tue Sep 22 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.3.20090918cvs
+- Modernize the spec a bit; nuke BuildRoot:, no more RPM_BUILD_ROOT.
+
+* Fri Sep 18 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.2.20090918cvs
+- New CVS snapshot; hopefully fix x86_64 startup crash and music issues.
+
+* Thu Sep 10 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.7.0-0.1.20090910cvs
+- Initial attempt to rebase to current CVS.
+- Update to use xz for compression of snapshot tarballs.
+- Rename "nazghul-haxima" package to "haxima", according to upstream wishes and
+ common sense.
+
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-7.20080407cvs
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nazghul/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 7 Apr 2008 15:04:35 -0000 1.10
+++ sources 29 Sep 2009 11:32:23 -0000 1.11
@@ -1 +1 @@
-c11c930146f5f04c6b14a2eeb345872b nazghul-20080407.tgz
+96ce0446611ae42d3aa59c75eaada5c1 nazghul-20090928.txz
More information about the scm-commits
mailing list