Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=d6814442a5d902412f19f01c9be882f2e0c1fca1
commit d6814442a5d902412f19f01c9be882f2e0c1fca1 Merge: 4218948 a2bd3fd Author: bouleetbil <[email protected]> Date: Fri Sep 2 10:23:30 2011 +0200 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/gnome/gnome-menus/FrugalBuild diff --cc source/gnome/gnome-menus/FrugalBuild index 3d1494f,9152548..91f497e --- a/source/gnome/gnome-menus/FrugalBuild +++ b/source/gnome/gnome-menus/FrugalBuild @@@ -10,23 -10,15 +10,24 @@@ makedepends=('intltool' 'gobject-intros groups=('gnome') replaces=('gnome-main-menu') archs=('i686' 'x86_64' 'ppc') +_F_gnome_git="n" Finclude gnome Fconfopts="$Fconfopts --enable-python --enable-debug=yes" - source=(${source[@]} gnomemenu.sh fix_build.diff) -source=(${source[@]} gnomemenu.sh controlcenter.diff Settings-System.directory) -sha1sums=('e20d2b4c6ed3a19324114a5bff7ef89e058c707d' \ ++source=(${source[@]} gnomemenu.sh fix_build.diff Settings-System.directory) +sha1sums=('1e0d64611f322aa6bd09a77ffb3c5244f13495b1' \ '7c71b08a5a7716a863be30e75d19ff82f8476e61' \ - '3fbd37114b8ea2bfa8e632ed7862c0a2a7967070') - '52d53d7ce162638b9750034bf1726b6cde4e3baf' \ ++ '3fbd37114b8ea2bfa8e632ed7862c0a2a7967070' \ + '30be6cdda8bd9d9ea4f464fd394f5d7d975405b5') +if [ "$_F_gnome_git" != "n" ]; then + unset sha1sums +fi build() { + if [ "$_F_gnome_git" != "n" ]; then + Funpack_scm + Fcd $pkgname + sh ./autogen.sh || Fdie + fi Fbuild #/etc/profile.d/gnomemenu.sh export prefix gnome- Fmv etc/xdg/menus/applications.menu etc/xdg/menus/gnome-applications.menu _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
