rpms/frozen-bubble/devel frozen-bubble.desktop, 1.1, 1.2 frozen-bubble.spec, 1.5, 1.6

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/frozen-bubble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4610

Modified Files:
	frozen-bubble.desktop frozen-bubble.spec 
Log Message:
Fix build with perl-devel split, minor changes.



Index: frozen-bubble.desktop
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/devel/frozen-bubble.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- frozen-bubble.desktop	26 Aug 2006 05:26:10 -0000	1.1
+++ frozen-bubble.desktop	22 Jun 2007 12:19:48 -0000	1.2
@@ -2,8 +2,8 @@
 Name=Frozen Bubble
 Comment=Frozen Bubble arcade game
 Exec=frozen-bubble
-Icon=frozen-bubble.png
+Icon=frozen-bubble
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;Game;ArcadeGame;
+Categories=Game;ArcadeGame;


Index: frozen-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/frozen-bubble/devel/frozen-bubble.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- frozen-bubble.spec	1 Dec 2006 10:40:11 -0000	1.5
+++ frozen-bubble.spec	22 Jun 2007 12:19:48 -0000	1.6
@@ -1,18 +1,19 @@
-Summary:        Frozen Bubble arcade game
-Name:           frozen-bubble
-Version:        2.1.0
-Release:        2%{?dist}
-License:        GPL
-Group:          Amusements/Games
-Source0:        http://www.frozen-bubble.org/data/frozen-bubble-%{version}.tar.bz2
-Source1:        frozen-bubble.desktop
-Source2:        fb-server.init
-URL:            http://www.frozen-bubble.org/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  perl-SDL >= 2.1.3, SDL_mixer-devel, SDL_Pango-devel
-BuildRequires:  glib2-devel, gettext, desktop-file-utils
-Requires:       perl-SDL >= 2.1.3
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Summary: Frozen Bubble arcade game
+Name: frozen-bubble
+Version: 2.1.0
+Release: 3%{?dist}
+License: GPL
+Group: Amusements/Games
+URL: http://www.frozen-bubble.org/
+Source0: http://www.frozen-bubble.org/data/frozen-bubble-%{version}.tar.bz2
+Source1: frozen-bubble.desktop
+Source2: fb-server.init
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: perl(ExtUtils::MakeMaker)
+BuildRequires: perl-SDL >= 2.1.3, SDL_mixer-devel, SDL_Pango-devel
+BuildRequires: glib2-devel, gettext, desktop-file-utils
+Requires: perl-SDL >= 2.1.3
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Full-featured, colorful animated penguin eyecandy, 100 levels of 1p game, hours
@@ -35,19 +36,19 @@
 %prep
 %setup -q
 # Add a directory to the module path for the app's private perl modules
-sed -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" frozen-bubble
-sed -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" frozen-bubble-editor
+%{__sed} -ie "s#use fb_stuff;#use lib qw(%{_libdir}/%{name}/perl);\n&#" \
+    frozen-bubble frozen-bubble-editor
 # Rename this README since the main server README has the same name
-mv server/init/README server/README.init
+%{__mv} server/init/README server/README.init
 # Change the example server configuration file to be a working one, which only
 # launches a LAN server and doesn't try to register itself on the Internet
-sed -ie "s#^a .*#z\nq\nL#" server/init/fb-server.conf
+%{__sed} -ie "s#^a .*#z\nq\nL#" server/init/fb-server.conf
 
 
 %build
-make %{?_smp_mflags} \
-    OPTIMIZE="${RPM_OPT_FLAGS}" \
-    CFLAGS="${RPM_OPT_FLAGS} `pkg-config glib-2.0 --cflags`" \
+%{__make} %{?_smp_mflags} \
+    OPTIMIZE="%{optflags}" \
+    CFLAGS="%{optflags} `pkg-config glib-2.0 --cflags`" \
     LIBS="`pkg-config glib-2.0 --libs`" \
     PREFIX=%{_prefix} \
     LIBDIR=%{_libexecdir} \
@@ -56,51 +57,54 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install \
+%{__rm} -rf %{buildroot}
+%{__make} install \
     PREFIX=%{_prefix} \
     LIBDIR=%{_libexecdir} \
     DATADIR=%{_datadir} \
-    DESTDIR=$RPM_BUILD_ROOT
+    DESTDIR=%{buildroot}
 %find_lang %{name}
 
 # Clean up unneeded files
-rm -f `find $RPM_BUILD_ROOT -name perllocal.pod`
-chmod -R u+w $RPM_BUILD_ROOT/*
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/fb_c_stuff/.packlist
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/fb_c_stuff/fb_c_stuff.bs
+%{__rm} -f `find %{buildroot} -name perllocal.pod`
+%{__chmod} -R u+w %{buildroot}/*
+%{__rm} -f %{buildroot}%{perl_vendorarch}/auto/fb_c_stuff/.packlist
+%{__rm} -f %{buildroot}%{perl_vendorarch}/auto/fb_c_stuff/fb_c_stuff.bs
 
 # Move some directories around
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/perl
-mv $RPM_BUILD_ROOT%{perl_vendorarch}/auto $RPM_BUILD_ROOT%{_libdir}/%{name}/perl
-mv $RPM_BUILD_ROOT%{perl_vendorarch}/*.pm $RPM_BUILD_ROOT%{_libdir}/%{name}/perl
-
-# Desktop file and icon stuff
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora            \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %{SOURCE1}
-install -D -p -m 644 icons/frozen-bubble-icon-16x16.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -D -p -m 644 icons/frozen-bubble-icon-32x32.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -D -p -m 644 icons/frozen-bubble-icon-48x48.png \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{__mkdir_p} %{buildroot}%{_libdir}/%{name}/perl
+%{__mv} %{buildroot}%{perl_vendorarch}/auto %{buildroot}%{_libdir}/%{name}/perl/
+%{__mv} %{buildroot}%{perl_vendorarch}/*.pm %{buildroot}%{_libdir}/%{name}/perl/
+
+# Desktop file
+%{__mkdir_p} %{buildroot}%{_datadir}/applications
+desktop-file-install \
+    --vendor "" \
+    --dir %{buildroot}%{_datadir}/applications \
+    %{SOURCE1}
+
+# Icons
+%{__install} -D -p -m 0644 icons/frozen-bubble-icon-16x16.png \
+    %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{__install} -D -p -m 0644 icons/frozen-bubble-icon-32x32.png \
+    %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{__install} -D -p -m 0644 icons/frozen-bubble-icon-48x48.png \
+    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 # Install server init script and default configuration
-install -D -p -m 755 %{SOURCE2} \
-    $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/fb-server
-install -D -p -m 644 server/init/fb-server.conf \
-    $RPM_BUILD_ROOT%{_sysconfdir}/fb-server.conf
+%{__install} -D -p -m 0755 %{SOURCE2} \
+    %{buildroot}%{_sysconfdir}/rc.d/init.d/fb-server
+%{__install} -D -p -m 0644 server/init/fb-server.conf \
+    %{buildroot}%{_sysconfdir}/fb-server.conf
 
 # Duplicate the server (it's tiny) to be used in both the game and standalone
 # server package
-cp -a $RPM_BUILD_ROOT%{_libexecdir}/%{name}/fb-server \
-      $RPM_BUILD_ROOT%{_bindir}/
+%{__cp} -a %{buildroot}%{_libexecdir}/%{name}/fb-server \
+    %{buildroot}%{_bindir}/
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 
 %post
@@ -117,7 +121,8 @@
 
 
 %post server
-/usr/sbin/useradd -r -s /sbin/nologin -d / fbubble &>/dev/null || :
+/usr/sbin/useradd -r -s /sbin/nologin -d %{_datadir}/%{name} fbubble \
+    &>/dev/null || :
 /sbin/chkconfig --add fb-server
 
 %preun server
@@ -134,18 +139,19 @@
 
 
 %files -f %{name}.lang
-%defattr(-, root, root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README TIPS
 %{_bindir}/%{name}*
 %{_libdir}/%{name}/
 %{_libexecdir}/%{name}/
-%{_datadir}/%{name}/
-%{_mandir}/man6/%{name}*.6.gz
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/%{name}/
+# The Makefile "install"s these, so they end up executable... fix here
+%attr(0644,root,root) %{_mandir}/man6/%{name}*.6.gz
 
 %files server
-%defattr(-, root, root)
+%defattr(-,root,root,-)
 %doc COPYING server/AUTHORS server/README*
 %config(noreplace) %{_sysconfdir}/fb-server.conf
 %{_sysconfdir}/rc.d/init.d/fb-server
@@ -153,6 +159,13 @@
 
 
 %changelog
+* Fri Jun 22 2007 Matthias Saou <http://freshrpms.net/> 2.1.0-3
+- Fix build with perl-devel split (ExtUtils/MakeMaker.pm build requirement).
+- Cosmetic changes to the spec file.
+- Change fbubble user's home from / to %%{_datadir}/%%{name}.
+- Remove the desktop file's "fedora" prefix.
+- Remove executable bit from the man pages.
+
 * Wed Nov 29 2006 Matthias Saou <http://freshrpms.net/> 2.1.0-2
 - Silence useradd call so there is no output upon update (#217902).