LinGui: improved rpm building

Resulting rpms have fewer warnings and no errors according to rpmlint.
No need to pre-build binaries.  Just configure and "make pkg.create.rpm"

Standard fedora rpms can be found in:
build/stage/rpm/RPMS and SRPMS

Binary packages are renamed according to handbrake naming convention in:
build/pkg



git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3220 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 23 insertions, 22 deletions

diff --git a/gtk/ghb.spec b/gtk/ghb.spec
index 5b838531c..009cccfc1 100644
--- a/gtk/ghb.spec
+++ b/gtk/ghb.spec
@@ -1,5 +1,3 @@
-%define name HandBrake
-%define release 1
 
 Name:		%{name}
 Version:	%{version}
@@ -7,17 +5,19 @@ Release:	%{release}%{?dist}
 Summary:	A program to transcode DVDs and other sources to MPEG-4
 
 Group:		Applications/Multimedia
-License:	GPL
+License:	GPLv2
 URL:		http://handbrake.fr/
-Vendor:		The HandBrake Project
 Source0:	%{name}-%{version}.tar.bz2
 Prefix:		%{_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:	glib2 >= 2.16, gtk2 >= 2.12, hal-libs, webkitgtk, gstreamer
-Requires:	gstreamer-plugins-base
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRequires: glib2-devel, gtk2-devel, hal-devel, webkitgtk-devel
+BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel
+Requires:	gtk2, coreutils
+
+%define debug_package %{nil}
 
 %description
-HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded 
+HandBrake is an open-source, GPL-licensed, multi-platform, multi-threaded 
 transcoder, available for MacOS X, Linux and Windows.
 
 %package gui
@@ -29,34 +29,31 @@ Summary:	A program to transcode DVDs and other sources to MPEG-4
 Group:		Applications/Multimedia
 
 %description gui
-HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded 
+HandBrake is an open-source, GPL-licensed, multi-platform, multi-threaded 
 transcoder, available for MacOS X, Linux and Windows.
 
 %description cli
-HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded 
+HandBrake is an open-source, GPL-licensed, multi-platform, multi-threaded 
 transcoder, available for MacOS X, Linux and Windows.
 
 %prep
-%setup -n %{name}-%{version} -D -T
-#%setup -q
-#cd %{_builddir}/%{name}-%{version}
+%setup -q
+cd %{_builddir}/%{name}-%{version}
 
 
 %build
-#./configure --prefix=%{_prefix}
-#make -C build
+./configure --debug=std --prefix=%{_prefix}
+make %{?_smp_mflags} -C build
 
 
 %install
-#rm -rf $RPM_BUILD_ROOT
-# I don't want to rebuild the world, so just install what I've prebuilt
-make -C $RPM_BUILD_ROOT/../.. DESTDIR=$RPM_BUILD_ROOT install
+make -C build DESTDIR=$RPM_BUILD_ROOT install-strip
 
 ## blow away stuff we don't want
 /bin/rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post gui
 touch --no-create %{_datadir}/icons/hicolor
@@ -73,7 +70,7 @@ fi
 %files gui
 %defattr(-,root,root,-)
 %doc NEWS AUTHORS CREDITS THANKS COPYING
-%{_datadir}/icons
+%{_datadir}/icons/hicolor
 %{_datadir}/applications
 %{_bindir}/ghb
 
@@ -83,7 +80,7 @@ fi
 %{_bindir}/HandBrakeCLI
 
 %changelog
-* Sat May 31 2008 John Stebbins <[email protected]> 
-- Initial release
+* Sun Apr 11 2010 John Stebbins <[email protected]> - svn
+- Snapshot release
 
 
diff --git a/gtk/module.rules b/gtk/module.rules
index c5de20ea8..e7d93e752 100644
--- a/gtk/module.rules
+++ b/gtk/module.rules
@@ -2,6 +2,7 @@ $(eval $(call import.MODULE.rules,GTK))
 
 build: hgtk.build gtk.build
 install: gtk.install
+install-strip: gtk.install-strip
 uninstall: gtk.uninstall
 clean: hgtk.clean gtk.clean
 xclean: hgtk.clean gtk.xclean
@@ -34,6 +35,9 @@ gtk.build: | $(GTK.build/)
 gtk.build: $(GTK.CONFIGURE.stamp) $(LIBHB.a)
 	+$(MAKE) -C $(GTK.build/)
 
+gtk.install-strip:
+	$(MAKE) -C $(GTK.build/) prefix=$(PREFIX) install-strip
+
 gtk.install:
 	$(MAKE) -C $(GTK.build/) prefix=$(PREFIX) install