LinGui: rpmbuild tool change broke building rpm packages

work around their silly cleaning of stuff that doesn't need to be cleaned

git-svn-id: svn://localhost/HandBrake/trunk@2753 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/gtk/ghb.spec b/gtk/ghb.spec
index e164ccb..f39d4fc 100644 (file)
--- a/gtk/ghb.spec
+++ b/gtk/ghb.spec
@@ -49,10 +49,11 @@ transcoder, available for MacOS X, Linux and Windows.
 
 %install
 #rm -rf $RPM_BUILD_ROOT
-#make -C build PREFIX=$RPM_BUILD_ROOT PREFIX/=$RPM_BUILD_ROOT/ install
+# I don't want to rebuild the world, so just install what I've prebuilt
+make -C $RPM_BUILD_ROOT/../.. PREFIX=$RPM_BUILD_ROOT/usr PREFIX/=$RPM_BUILD_ROOT/usr/ install
 
 ## blow away stuff we don't want
-/bin/rm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
+/bin/rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 
 %clean
 rm -rf $RPM_BUILD_ROOT

diff --git a/pkg/linux/module.rules b/pkg/linux/module.rules
index 22f6c7c..2d5b1a2 100644 (file)
--- a/pkg/linux/module.rules
+++ b/pkg/linux/module.rules
@@ -12,7 +12,7 @@ $(PKG.gui.rpm) $(PKG.cli.rpm):
        $(CP.exe) $(GTK.src/)ghb.spec $(RPM.out/)SPECS
        $(CP.exe) $(PKG.src.tar.bz2) $(RPM.out/)SOURCES
        $(TAR.exe) -xf $(PKG.src.tar.bz2) -C $(RPM.out/)BUILD
-       fakeroot $(MAKE) PREFIX=$(RPMROOT.out/)usr PREFIX/=$(RPMROOT.out/)usr/ install
+#      fakeroot $(MAKE) PREFIX=$(RPMROOT.out/)usr PREFIX/=$(RPMROOT.out/)usr/ install
        rpmbuild --define="version $(HB.version)" --define="_topdir $(PWD)/$(RPM.out)" --buildroot $(RPMROOT.out) -ba $(GTK.src/)ghb.spec
        $(CP.exe) $(RPM.out/)RPMS/$(PKG.rpm.machine)/$(HB.name)-cli-$(HB.version)*.rpm $(PKG.cli.rpm)
        $(CP.exe) $(RPM.out/)RPMS/$(PKG.rpm.machine)/$(HB.name)-gui-$(HB.version)*.rpm $(PKG.gui.rpm)