rpms/pinball/devel pinball.spec,1.5,1.6

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/pinball/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13472

Modified Files:
	pinball.spec 
Log Message:
* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-10
- Drop the bogus -devel package (also fixing the multilib conficts caused by
  it, bz 342881)



Index: pinball.spec
===================================================================
RCS file: /cvs/extras/rpms/pinball/devel/pinball.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pinball.spec	24 Sep 2007 19:57:25 -0000	1.5
+++ pinball.spec	21 Oct 2007 20:35:25 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           pinball
 Version:        0.3.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Emilia Pinball game
 Group:          Amusements/Games
 License:        GPL+
@@ -22,15 +22,6 @@
 There is only one level to play with but it is however very addictive.
 
 
-%package        devel
-Summary:        Development Headers and Libraries for Emilia Pinball
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description devel
-Development Headers and Libraries for Emilia Pinball
-
-
 %prep
 %setup -q
 %patch0 -p1 -z .sys-ltdl
@@ -52,7 +43,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" install
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 # remove unused global higescorefiles:
 rm -fr $RPM_BUILD_ROOT%{_localstatedir}
@@ -60,6 +51,9 @@
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/libModuleTest.*
 # .la files are needed for ltdl
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.{a,so}
+# remove bogus development files
+rm $RPM_BUILD_ROOT%{_bindir}/%{name}-config
+rm -r $RPM_BUILD_ROOT%{_includedir}/%{name}
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -92,20 +86,17 @@
 %defattr(-,root,root,-)
 %doc README ChangeLog
 %{_bindir}/%{name}*
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/lib*.so.*
-%{_libdir}/%{name}/lib*.la
+%{_libdir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
-%files devel
-%defattr(-,root,root,-)
-%{_bindir}/%{name}-config
-%{_includedir}/%{name}
-
 
 %changelog
+* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-10
+- Drop the bogus -devel package (also fixing the multilib conficts caused by
+  it, bz 342881)
+
 * Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-9
 - Use opengl-games-utils wrapper to show error dialog when DRI is missing