diff options
| author | jstebbins <[email protected]> | 2009-08-07 17:56:46 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2009-08-07 17:56:46 +0000 |
| commit | f3a6967bf5ba2aad43ed4a8e599719950ca91246 (patch) | |
| tree | c093dc6e53a2ec0db45516de83ec8e5214d9c645 | |
| parent | d9e4eaf0e289c477945a91a3576f740d41bc7750 (diff) | |
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://svn.handbrake.fr/HandBrake/trunk@2753 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | gtk/ghb.spec | 5 | ||||
| -rw-r--r-- | pkg/linux/module.rules | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gtk/ghb.spec b/gtk/ghb.spec index e164ccb77..f39d4fcd5 100644 --- 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 22f6c7cfd..2d5b1a223 100644 --- 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) |