rpms/enigma/EL-4 .cvsignore, 1.4, 1.5 enigma.spec, 1.8, 1.9 sources, 1.4, 1.5

[Thorsten Leemhuis (thl)]

Author: thl

Update of /cvs/pkgs/rpms/enigma/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21833

Modified Files:
	.cvsignore enigma.spec sources 
Log Message:
sync with F8


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/enigma/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	25 Jun 2005 11:34:47 -0000	1.4
+++ .cvsignore	10 Dec 2007 11:07:42 -0000	1.5
@@ -1 +1 @@
-enigma-0.92.tar.gz
+enigma-1.00.tar.gz


Index: enigma.spec
===================================================================
RCS file: /cvs/pkgs/rpms/enigma/EL-4/enigma.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- enigma.spec	25 Jun 2005 11:34:47 -0000	1.8
+++ enigma.spec	10 Dec 2007 11:07:42 -0000	1.9
@@ -1,17 +1,25 @@
 Name:           enigma
-Version:        0.92
-Release:        1%{?dist}
+Version:        1.01
+Release:        3%{?dist}
 Summary:        Clone of the ATARI game Oxyd
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://www.nongnu.org/enigma/
-Source0:        http://savannah.nongnu.org/download/enigma/enigma-0.92.tar.gz
+Source0:        http://download.berlios.de/enigma-game/enigma-1.01-64bit.tar.gz
+Patch0:         enigma-1.01-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  SDL-devel >= 1.2  SDL_image-devel >= 1.2 SDL_mixer-devel >= 1.2.4
-BuildRequires:  SDL_ttf-devel gettext libpng-devel
-BuildRequires:  desktop-file-utils zlib-devel >= 1.2.0 tetex >= 2.0.2
+BuildRequires:  SDL-devel >= 1.2  
+BuildRequires:  SDL_image-devel >= 1.2 
+BuildRequires:  SDL_mixer-devel >= 1.2.4
+BuildRequires:  SDL_ttf-devel >= 2.0.4
+BuildRequires:  gettext
+BuildRequires:  libpng-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  zlib-devel >= 1.2.0
+BuildRequires:  tetex >= 2.0.2
+BuildRequires:  xerces-c-devel
 
 %description
 Enigma is a tribute to and a re-implementation of one of the most
@@ -23,21 +31,23 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --enable-optimize
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall pngdir=${RPM_BUILD_ROOT}/%{_docdir}/enigma-%{version}/html/images htmldir=${RPM_BUILD_ROOT}/%{_docdir}/enigma-%{version}/html/ docdir=${RPM_BUILD_ROOT}/%{_docdir}/enigma-%{version}/html/reference
-mv $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}/html .
+rm -rf $RPM_BUILD_ROOT __doc
+make install DESTDIR=$RPM_BUILD_ROOT
+mkdir __doc
+mv $RPM_BUILD_ROOT%{_datadir}/doc/enigma/ __doc
 
 desktop-file-install \
   --delete-original                                        \
   --vendor fedora                                          \
+  --remove-key Version \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications            \
-  --add-category "X-Fedora"                                 \
   $RPM_BUILD_ROOT%{_datadir}/applications/enigma.desktop
 
 %find_lang %{name}
@@ -45,17 +55,58 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
+
+%postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README AUTHORS ChangeLog COPYING NEWS doc/TODO html/
+%doc README AUTHORS CHANGES COPYING ACKNOWLEDGEMENTS __doc/*
 %{_datadir}/enigma
 %{_bindir}/enigma
 %{_mandir}/man?/enigma.*
 %{_datadir}/icons/hicolor/48x48/apps/enigma.png
 %{_datadir}/pixmaps/enigma.png
 %{_datadir}/applications/*enigma.desktop
+# we don't need the enet stuff
+%exclude %{_includedir}/enet/
+%exclude %{_libdir}/libenet.a
 
 %changelog
+* Wed Sep 12 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.01-3.1
+- use the newly 64bit-clean upstream tarball
+
+* Tue Aug 21 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.01-2.1
+- Remove version key from desktop file
+
+* Fri Aug 03 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info>
+- Update License field due to the "Licensing guidelines changes"
+
+* Tue Jun 5 2007 Wart <wart at kobold.org> - 1.01-2
+- Clean up desktop categories
+
+* Sat May 26 2007 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.01-1
+- Update to 1.01
+
+* Thu Dec 14 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0-1
+- Update to 1.0
+- drop enigma-gcc41.patch
+- formating changes
+- use make install DESTDIR
+- new download URL
+
+* Mon Aug 28 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.92-4
+- Rebuild for Fedora Extras 6
+
+* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.92-3
+- Rebuild for Fedora Extras 5
+
+* Mon Jan 23 2006 Adrian Reber <adrian at lisas.de> - 0.92-2
+- Added patch to build with gcc 4.1
+
 * Sat May 07 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.92-1
 - Update to 0.92
 - Use disttag
@@ -73,6 +124,7 @@
 - Update to 0.91
 - Add BR gettext, SDL_ttf-devel
 - Use find_lang
+- gtk-update-icon-cache in post and postun
 - Remove GCC patches
 
 * Thu Apr 14 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.81-5


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/enigma/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Jun 2005 11:34:47 -0000	1.4
+++ sources	10 Dec 2007 11:07:42 -0000	1.5
@@ -1 +1 @@
-b33d8fad75910c9a525f4382f5185f75  enigma-0.92.tar.gz
+d58af8a7201601dabc45dcedae5e2e91  enigma-1.01-64bit.tar.gz