Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=fdb5eed948f958ae8966b5f646d3cabc6fdd8bf0
commit fdb5eed948f958ae8966b5f646d3cabc6fdd8bf0 Merge: d1ce2f0 b126f09 Author: bouleetbil <bouleet...@frogdev.info> Date: Sat Dec 17 11:08:10 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/gnome-extra/libgtkhtml/FrugalBuild source/gnome-extra/orbit2/FrugalBuild source/gnome-extra/rygel/FrugalBuild source/gnome/at-spi2-atk/FrugalBuild source/gnome/at-spi2-core/FrugalBuild source/gnome/caribou/FrugalBuild source/gnome/dconf/FrugalBuild source/gnome/evince/FrugalBuild source/gnome/gconf/FrugalBuild source/gnome/gedit/FrugalBuild source/gnome/gjs/FrugalBuild source/gnome/gksu-frugalware/FrugalBuild source/gnome/gnome-desktop/FrugalBuild source/gnome/gnome-frugalware/FrugalBuild source/gnome/gnome-icon-theme-symbolic/FrugalBuild source/gnome/gnome-js-common/FrugalBuild source/gnome/gnome-keyring/FrugalBuild source/gnome/gnome-screensaver/FrugalBuild source/gnome/gnome-shell-frugalware-theme/FrugalBuild source/gnome/gnome-terminal/FrugalBuild source/gnome/gtkhtml/FrugalBuild source/gnome/gtksourceview3/FrugalBuild source/gnome/gucharmap/FrugalBuild source/gnome/libgdata/FrugalBuild source/gnome/libgnome-keyring/FrugalBuild source/gnome/libgnomekbd/FrugalBuild source/gnome/libgweather/FrugalBuild source/gnome/librest/FrugalBuild source/gnome/libsocialweb/FrugalBuild source/gnome/metacity/FrugalBuild source/gnome/mutter/FrugalBuild source/gnome/seahorse-sharing/FrugalBuild source/gnome/zenity/FrugalBuild source/xapps-extra/gummi/FrugalBuild source/xlib-extra/libvirt/FrugalBuild diff --cc source/gnome-extra/libgtkhtml/FrugalBuild index 0280e8b,c517eef..35043aa --- a/source/gnome-extra/libgtkhtml/FrugalBuild +++ b/source/gnome-extra/libgtkhtml/FrugalBuild @@@ -7,8 -7,8 +7,8 @@@ pkgrel=1 pkgdesc="A GTK+2 based HTML rendering library" url="http://www.gnome.org/"; depends=('gail' 'libxml2>=2.7.8' 'gtk+2>=2.20.0-2') -groups=('gnome') +groups=('gnome-extra') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') _F_gnome_devel="y" Finclude gnome sha1sums=('1325c1540091b89cc03d99a1e594285d2e846e50') diff --cc source/gnome-extra/rygel/FrugalBuild index f56b096,3bc35c5..d27fdb3 --- a/source/gnome-extra/rygel/FrugalBuild +++ b/source/gnome-extra/rygel/FrugalBuild @@@ -2,10 -2,10 +2,10 @@@ # Maintainer: bouleetbil <bouleet...@frogdev.info> pkgname=rygel -pkgver=0.12.6 +pkgver=0.13.0 pkgrel=1 pkgdesc="Implementation of the UPnP MediaServer" - depends=('libgee>=0.6.0' 'gupnp-vala>=0.10.2' 'gconf>=3.2.0' 'gstreamer' 'gupnp-dlna') + depends=('libgee>=0.6.0' 'gupnp-vala>=0.10.2' 'gconf>=3.2.0' 'gstreamer' 'gupnp-dlna' 'gtk+3') makedepends=('intltool') groups=('gnome-extra') archs=('i686' 'x86_64') diff --cc source/gnome/at-spi2-atk/FrugalBuild index 06d0ea8,6fdcfe5..f2ce1b8 --- a/source/gnome/at-spi2-atk/FrugalBuild +++ b/source/gnome/at-spi2-atk/FrugalBuild @@@ -2,16 -2,16 +2,16 @@@ # Maintainer: bouleetbil <bouleet...@frogdev.info> pkgname=at-spi2-atk -pkgver=2.2.2 +pkgver=2.3.2 pkgrel=1 pkgdesc="Gnome Accessibility Toolkit" -depends=('atk' 'dbus-glib' 'at-spi2-core>=2.2.2') +depends=('atk' 'dbus-glib' 'at-spi2-core>=2.3.2') makedepends=('perl-xml-parser' 'intltool') groups=('gnome') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') -Finclude gnome -Fconfopts="$Fconfopts --disable-gtk-doc" -sha1sums=('82fcfaa984b250ef21a51e167bcd5f5f9d368ae1') +_F_gnome_doc="y" +Finclude gnome gnome-scriptlet +sha1sums=('4126421ef162fabe4ccf4ead7e5bf3d58c061f9c') replaces=('at-spi' 'gok' 'dasher') provides=('at-spi') conflicts=('at-spi') diff --cc source/gnome/at-spi2-core/FrugalBuild index ef00a6b,0b31577..d9856f8 --- a/source/gnome/at-spi2-core/FrugalBuild +++ b/source/gnome/at-spi2-core/FrugalBuild @@@ -8,9 -8,9 +8,9 @@@ pkgdesc="Gnome Accessibility Toolkit depends=('atk' 'dbus-glib' 'gtk+3') makedepends=('perl-xml-parser' 'intltool' 'libxtst' 'gobject-introspection') groups=('gnome') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') -Finclude gnome -Fconfopts="$Fconfopts --disable-gtk-doc" -sha1sums=('52ea90d682a7a01566ae58a0b2ed8b72612dc29e') +_F_gnome_doc="y" +Finclude gnome gnome-scriptlet +sha1sums=('e3bc624a7b64c0ab2b46a5fe558db2d983e9fb8d') # optimization OK diff --cc source/gnome/caribou/FrugalBuild index 23b6972,f33e909..0aae83a --- a/source/gnome/caribou/FrugalBuild +++ b/source/gnome/caribou/FrugalBuild @@@ -3,15 -3,14 +3,15 @@@ pkgname=caribou pkgver=0.4.1 -pkgrel=1 +pkgrel=4 pkgdesc="A simplified in-place on-screen keyboard" -depends=('gtk+3' 'clutter' 'pygobject3-cairo' \ +depends=('gtk+3' 'clutter>=1.0.2-3' 'pygobject3-cairo' \ 'libgee' 'libxklavier' 'libxtst') makedepends=('intltool' 'gnome-doc-utils' 'gobject-introspection' 'gtk+2') -groups=('gnome') +groups=('gnome' 'gnome-minimal') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') options=('nostrip') +_F_gnome_doc="y" _F_gnome_glib="y" Finclude gnome gnome-scriptlet sha1sums=('0a0f54f27fd58d1ebad685e65d3106c6646a6c9a') diff --cc source/gnome/dconf/FrugalBuild index 3123246,b204770..78417a0 --- a/source/gnome/dconf/FrugalBuild +++ b/source/gnome/dconf/FrugalBuild @@@ -7,21 -7,20 +7,23 @@@ pkgrel= pkgdesc="A configuration system" depends=('dbus-glib' 'libxml2>=2.7.8') makedepends=('vala' 'gobject-introspection' 'libgee') +groups=('gnome' 'gnome-minimal') - archs=('i686' 'x86_64' 'ppc') ++archs=('i686' 'x86_64') + #rodepends can be removed after 1.5 + rodepends=('dconf-editor') -groups=('gnome') -archs=('i686' 'x86_64') _F_gnome_glib="y" +_F_gnome_doc="y" Finclude gnome gnome-scriptlet -sha1sums=('d5ab13cc42b8c94241a59adc0e7724742caef634') +sha1sums=('d8a2778f6aea4897acb2d002daecdd8174be4e38') -subpkgs=('dconf-editor') -subdescs=('Configuration editor for dconf') -subdepends=('gtk+3 libgee') -subrodepends=('dconf') -subgroups=('gnome') -subarchs=('i686 x86_64') +subpkgs=("${subpkgs[@]}" 'dconf-editor') +subdescs=("${subdescs[@]}" 'Configuration editor for dconf') +subdepends=("${subdepends[@]}" 'gtk+3 libgee') +subrodepends=("${subrodepends[@]}" 'dconf') +subgroups=("${subgroups[@]}" 'gnome') - subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') ++subarchs=("${subarchs[@]}" 'i686 x86_64') +subreplaces=("${subreplaces[@]}" '') +subprovides=("${subprovides[@]}" '') build() { Fbuild diff --cc source/gnome/evince/FrugalBuild index f209261,0fb56e1..1be8215 --- a/source/gnome/evince/FrugalBuild +++ b/source/gnome/evince/FrugalBuild @@@ -12,31 -12,22 +12,28 @@@ makedepends=('intltool' 'gnome-doc-util 'gobject-introspection>=0.9.6' 'nautilus>=3.1.90' 'texlive') replaces=('gpdf') groups=('gnome') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') + _F_gnome_glib="y" + _F_gnome_iconcache="y" + _F_gnome_scrollkeeper="y" + _F_gnome_desktop="y" + Finclude gnome gnome-scriptlet + url="http://www.gnome.org/projects/evince/"; + sha1sums=('2e5145ace9870e584a7ef28b734a004530db27a6') + + subpkgs=('evince-nautilus') subdescs=('Evince plugin for Nautilus') subdepends=("nautilus>=2.91.0") subrodepends=("$pkgname=$pkgver") subgroups=('gnome') - subarchs=('x86_64 i686 ppc') + subarchs=('x86_64 i686') +subreplaces=('') +subprovides=('') - _F_gnome_doc="y" - _F_gnome_glib="y" - _F_gnome_iconcache="y" - _F_gnome_scrollkeeper="y" - _F_gnome_desktop="y" - _F_gnome_git="n" - Finclude gnome gnome-scriptlet - url="http://www.gnome.org/projects/evince/"; - sha1sums=('59670a1bdfffab1ab5fee43b3b04a112132f534b') - +if [ "$_F_gnome_git" != "n" ]; then + unset sha1sums +fi - [ "$CARCH" == "x86_64" ] && \ ( CFLAGS="$CFLAGS -fPIC -DPIC" && LIB_CFLAGS="-fPIC -DPIC" ) diff --cc source/gnome/gconf/FrugalBuild index a0f31a3,57f826e..e4568b6 --- a/source/gnome/gconf/FrugalBuild +++ b/source/gnome/gconf/FrugalBuild @@@ -10,8 -10,8 +10,8 @@@ pkgdesc="A configuration database syste url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'dbus-glib' 'polkit>=0.101') makedepends=('indent' 'gtk-doc>=1.11' 'openldap>=2.4.16' 'perl-xml-parser' 'intltool' 'gobject-introspection') -groups=('gnome') +groups=('gnome' 'gnome-minimal') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') Finclude gnome source=(${source[@]} gconf-2.16.0-reload.patch) sha1sums=('3d49d7a82343acf91e87433530bcd3bf7a44b4d6' \ @@@ -29,8 -29,8 +29,13 @@@ subpkgs=("${subpkgs[@]}" 'gconf-gtk' subdescs=("${subdescs[@]}" 'graphical gconf utilities') subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver") subdepends=("${subdepends[@]}" "gtk+3") ++<<<<<<< HEAD +subgroups=("${subgroups[@]}" 'gnome gnome-minimal') +subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') ++======= + subgroups=("${subgroups[@]}" 'gnome') + subarchs=("${subarchs[@]}" 'i686 x86_64') ++>>>>>>> b126f09d4f1857b7822fc184c4eb1fad39fd3100 build() { Fcd GConf-$pkgver diff --cc source/gnome/gedit/FrugalBuild index 550a60d,b26177f..e25d9cb --- a/source/gnome/gedit/FrugalBuild +++ b/source/gnome/gedit/FrugalBuild @@@ -2,8 -2,8 +2,7 @@@ # Maintainer: bouleetbil <bouleet...@frogdev.info> pkgname=gedit - pkgver=3.2.3 - pkgrel=2 + pkgver=3.2.5 -pkgrel=1 pkgdesc="A text editor for GNOME" url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'gtk+3>=3.0.8' 'rarian' 'desktop-file-utils' 'gtksourceview3' 'dbus-glib>=0.74' \ @@@ -14,9 -14,9 +13,10 @@@ archs=('i686' 'x86_64' _F_gnome_glib="y" _F_gnome_scrollkeeper="y" _F_gnome_desktop="y" +_F_gnome_doc="y" + _F_gnome_ext=".tar.xz" Finclude gnome gnome-scriptlet - sha1sums=('3a91bff16f4a007c16f8224631d7823afb906baa') + sha1sums=('a95b9ae7e859c64b621961999462f37b6fc7c596') replaces=("$pkgname-python") build() { diff --cc source/gnome/gjs/FrugalBuild index a3e864e,5421bf4..4648876 --- a/source/gnome/gjs/FrugalBuild +++ b/source/gnome/gjs/FrugalBuild @@@ -8,11 -8,11 +8,11 @@@ pkgdesc="Javascript Bindings for GNOME url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'xulrunner>=6.0.2' 'cairo') makedepends=('intltool' 'gnome-doc-utils' 'gnome-common' 'gobject-introspection>=1.29.15') -groups=('gnome') +groups=('gnome' 'gnome-minimal') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') _F_gnome_git="n" Finclude gnome -sha1sums=('d9137a9463137dfa218769af44ac8ef266f503d1') +sha1sums=('85e6536134f2689ae3355a1b67fc9f4c58021018') unset MAKEFLAGS if [ "$_F_gnome_git" != "n" ]; then unset sha1sums diff --cc source/gnome/gksu-frugalware/FrugalBuild index b80fcfd,fbe84d5..ea094f1 --- a/source/gnome/gksu-frugalware/FrugalBuild +++ b/source/gnome/gksu-frugalware/FrugalBuild @@@ -8,8 -8,8 +8,9 @@@ pkgrel= pkgdesc="Launch X application as root" rodepends=('gtk+2' 'gtk-usermode') url=http://www.frugalware.org -groups=('gnome' 'gnome-apps') -archs=('i686' 'x86_64') +groups=('gnome' 'gnome-minimal') +archs=('i686' 'x86_64' 'ppc') ++#don't remove ppc archs replaces=('libgksu' 'gksu' 'nautilus-gksu') conflicts=('gksu') provides=('gksu') diff --cc source/gnome/gnome-desktop/FrugalBuild index c46b191,cf55eea..4b38493 --- a/source/gnome/gnome-desktop/FrugalBuild +++ b/source/gnome/gnome-desktop/FrugalBuild @@@ -9,13 -9,12 +9,13 @@@ url="http://www.gnome.org/ depends=('libxml2>=2.7.8' 'gtk+3' 'startup-notification>=0.10-2' 'rarian>=0.8.0' 'libxrandr' 'gsettings-desktop-schemas' \ 'xcb-util>=0.3.8') makedepends=('intltool' 'gnome-doc-utils>=0.18.0' 'gtk-doc' 'gobject-introspection') -groups=('gnome') +groups=('gnome' 'gnome-minimal') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') _F_gnome_scrollkeeper="y" +_F_gnome_doc="y" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --with-gnome-distributor=Frugalware --enable-gtk-doc" -sha1sums=('17f0d22a8781fed451619a73732c0231dcdf953f') +sha1sums=('34966c3c438bb6412f79ac465e38dae27525c862') replaces=('desktop-data-model' 'gnome-volume-manager' 'gnome-spell' 'gnome-art' 'xournal' 'keytouch' \ 'system-tools-backends' 'liboobs'\ 'gnome-theme-airlines' 'gnome-theme-aquadreams' \ diff --cc source/gnome/gnome-icon-theme-symbolic/FrugalBuild index 5b7c73a,8fe5e39..3a02572 --- a/source/gnome/gnome-icon-theme-symbolic/FrugalBuild +++ b/source/gnome/gnome-icon-theme-symbolic/FrugalBuild @@@ -8,7 -8,7 +8,7 @@@ pkgdesc="Symbolic GNOME icons url="http://www.gnome.org/"; depends=('hicolor-icon-theme' 'gdk-pixbuf2' 'gnome-icon-theme') makedepends=('perl-xml-parser' 'icon-naming-utils>=0.8.2' 'intltool' 'gtk+2-tools') -groups=('gnome') +groups=('gnome' 'gnome-minimal') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') Finclude gnome sha1sums=('ab96b4104920e411c7d681709e94abcb65db314a') diff --cc source/gnome/gnome-js-common/FrugalBuild index 3b69e07,dd84445..c927309 --- a/source/gnome/gnome-js-common/FrugalBuild +++ b/source/gnome/gnome-js-common/FrugalBuild @@@ -7,8 -7,8 +7,8 @@@ pkgrel= pkgdesc="Common JavaScript modules for GNOME." depends=('glibc') makedepends=('gtk-doc' 'intltool') -groups=('gnome') +groups=('gnome' 'gnome-minimal') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') options=('scriptlet') _F_gnome_devel="y" Finclude gnome diff --cc source/gnome/gnome-keyring/FrugalBuild index 2ebec5d,daa0c9b..314a4dd --- a/source/gnome/gnome-keyring/FrugalBuild +++ b/source/gnome/gnome-keyring/FrugalBuild @@@ -7,11 -7,11 +7,11 @@@ pkgrel= pkgdesc="Password and keyring managing daemon for GNOME" url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'gtk+3' 'dbus-glib>=0.76-1' \ - 'libtasn1>=1.4' 'gconf' 'pam' 'libgnome-keyring>=3.2.2' \ - 'p11-kit' 'libcap' 'ca-certificates') + 'libtasn1>=1.4' 'gconf' 'pam' 'libgnome-keyring>=3.2.0' \ + 'p11-kit' 'libcap' 'ca-certificates' 'gcr>=3.3.2') makedepends=('intltool' 'gtk-doc>=1.9') -groups=('gnome') +groups=('gnome' 'gnome-minimal') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') _F_gnome_iconcache="y" _F_gnome_mime="y" _F_gnome_glib="y" diff --cc source/gnome/gnome-menus/FrugalBuild index 529c272,a65eed3..a9501d5 --- a/source/gnome/gnome-menus/FrugalBuild +++ b/source/gnome/gnome-menus/FrugalBuild @@@ -7,9 -7,9 +7,9 @@@ pkgrel= pkgdesc="GNOME menus and menu editor" depends=('gamin>=0.1.9-3' 'python>=2.7') makedepends=('intltool' 'gobject-introspection') -groups=('gnome') +groups=('gnome' 'gnome-minimal') replaces=('gnome-main-menu') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') _F_gnome_git="n" Finclude gnome Fconfopts="$Fconfopts --enable-python --enable-debug=yes" diff --cc source/gnome/gnome-screensaver/FrugalBuild index 5e3a8bf,5cc5ef5..8e42bf1 --- a/source/gnome/gnome-screensaver/FrugalBuild +++ b/source/gnome/gnome-screensaver/FrugalBuild @@@ -9,8 -9,9 +9,8 @@@ url="http://live.gnome.org/GnomeScreens depends=('libxml2>=2.7.8' 'dbus-glib>=0.71' 'gnome-menus>=3.0.0' 'libgnomekbd>=2.91.0' 'gtk+3' \ 'libxscrnsaver' 'shadow' 'xscreensaver-data' 'gnome-desktop>=3.1.91') makedepends=('intltool' 'scrnsaverproto') -groups=('gnome') +groups=('gnome' 'gnome-minimal') - archs=('x86_64' 'i686' 'ppc') + archs=('x86_64' 'i686') -Finclude gnome gnome-scriptlet _F_gnome_glib="y" _F_gnome_desktop="y" _F_gnome_scrollkeeper="y" diff --cc source/gnome/gnome-shell-frugalware-theme/FrugalBuild index 5e5a8f4,1eb6adf..ac945ef --- a/source/gnome/gnome-shell-frugalware-theme/FrugalBuild +++ b/source/gnome/gnome-shell-frugalware-theme/FrugalBuild @@@ -7,8 -7,8 +7,8 @@@ pkgrel= pkgdesc="Frugalware theme for gnome-shell" url="http://frugalware.org"; depends=() -groups=('gnome') +groups=('gnome' 'gnome-minimal') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') up2date="Flasttar http://ftp.frugalware.org/pub/other/artwork/$pkgname"; source=(http://ftp.frugalware.org/pub/other/artwork/$pkgname/$pkgname-$pkgver.tar.bz2) sha1sums=('81e1669bc93324b11aad987f96f0848b3c3b35ba') diff --cc source/gnome/gnome-terminal/FrugalBuild index 97aac67,ee4d10a..7fa001e --- a/source/gnome/gnome-terminal/FrugalBuild +++ b/source/gnome/gnome-terminal/FrugalBuild @@@ -9,11 -9,10 +9,11 @@@ url="http://www.gnome.org/ depends=('libxml2>=2.7.8' 'startup-notification' 'vte3>=0.30.1' 'rarian' 'gconf' \ 'avahi-glib>=0.6.23' 'dbus-glib>=0.76' 'gsettings-desktop-schemas') makedepends=('intltool' 'gnome-doc-utils>=0.20.0' 'gtk+2-tools') -groups=('gnome') +groups=('gnome' 'gnome-minimal') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') _F_gnome_scrollkeeper="y" _F_gnome_schemas=('/etc/gconf/schemas/gnome-terminal.schemas') +_F_gnome_doc="y" Finclude gnome gnome-scriptlet source=(${source[@]} 00-$pkgname-2.12.0-prompt.patch) sha1sums=('81e227e2c72ca12016c93ff199529fc569b66c1d' \ diff --cc source/gnome/gtkhtml/FrugalBuild index f550fa9,495cddf..1c14eb6 --- a/source/gnome/gtkhtml/FrugalBuild +++ b/source/gnome/gtkhtml/FrugalBuild @@@ -10,10 -10,9 +10,10 @@@ depends=('libxml2>=2.7.8' 'gtk+3' 'gcon 'enchant' 'iso-codes' 'gsettings-desktop-schemas') makedepends=('intltool') groups=('gnome') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') -Finclude gnome -sha1sums=('e10d4787e6b26ad7ad2cf413eab5918bd3790a01') +_F_gnome_doc="y" +Finclude gnome gnome-scriptlet +sha1sums=('09574309c3c114e03afa98a5382b304e80f65eb9') replaces=('gtkhtml312') provides=('gtkhtml312') diff --cc source/gnome/gtksourceview3/FrugalBuild index 74a0e00,75f0bec..7c6a485 --- a/source/gnome/gtksourceview3/FrugalBuild +++ b/source/gnome/gtksourceview3/FrugalBuild @@@ -9,9 -9,8 +9,9 @@@ pkgdesc="A text widget adding syntax hi depends=('libxml2>=2.7.8' 'gtk+3') makedepends=('intltool' 'gtk-doc' 'libglade3' 'gobject-introspection') groups=('gnome') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') -Finclude gnome +_F_gnome_doc="y" +Finclude gnome gnome-scriptlet source=(${source[@]} frugalbuild.lang) _F_cd_path="$_F_gnome_name-$pkgver" sha1sums=('052b5056564e6092fde0df757d5cf6039e819053' \ diff --cc source/gnome/gucharmap/FrugalBuild index 6d6a084,206c3da..8919482 --- a/source/gnome/gucharmap/FrugalBuild +++ b/source/gnome/gucharmap/FrugalBuild @@@ -8,8 -8,8 +8,8 @@@ pkgdesc="A featureful Unicode characte url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'rarian' 'gtk+3' 'gconf>=3.2.0') makedepends=('intltool' 'gnome-doc-utils>=0.14.0') -groups=('gnome') +groups=('gnome' 'gnome-minimal') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') _F_gnome_scrollkeeper="y" _F_gnome_iconcache="y" _F_gnome_desktop="y" diff --cc source/gnome/libcryptui/FrugalBuild index 37e4c38,0fa3a29..74bf641 --- a/source/gnome/libcryptui/FrugalBuild +++ b/source/gnome/libcryptui/FrugalBuild @@@ -8,10 -8,10 +8,10 @@@ pkgdesc="Interface components for OpenP depends=('dbus-glib' 'libgcrypt' 'gpgme' 'gtk+3' 'gnome-keyring' 'libnotify') makedepends=('intltool' 'gobject-introspection') groups=('gnome') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') _F_gnome_glib="y" +_F_gnome_doc="y" Finclude gnome gnome-scriptlet -Fconfopts="$Fconfopts --disable-gtk-doc" sha1sums=('f238c6dd0b79b93ab1f39b000fbecf2d6ea753f3') # optimization OK diff --cc source/gnome/libgdata/FrugalBuild index 1826295,abd856a..53f553c --- a/source/gnome/libgdata/FrugalBuild +++ b/source/gnome/libgdata/FrugalBuild @@@ -7,11 -7,10 +7,11 @@@ pkgrel= pkgdesc="libgdata is a GLib-based library for accessing online service APIs using the GData protocol" depends=('libxml2>=2.7.8' 'libsoup-gnome>=2.30.0' 'sqlite3' 'liboauth') makedepends=('intltool' 'gobject-introspection>=1.29.15') -groups=('gnome') +groups=('gnome' 'gnome-minimal') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') options=('scriptlet') -Finclude gnome +_F_gnome_doc="y" +Finclude gnome gnome-scriptlet sha1sums=('4e206c99efe65001a659c2adcafee6598835380e') # optimization OK diff --cc source/gnome/libgnome-keyring/FrugalBuild index 73e8101,592d16f..afbf6fd --- a/source/gnome/libgnome-keyring/FrugalBuild +++ b/source/gnome/libgnome-keyring/FrugalBuild @@@ -8,10 -8,10 +8,10 @@@ pkgdesc="Compatibility library for acce url="http://www.gnome.org/"; depends=('dbus-glib' 'libgcrypt' 'eggdbus') makedepends=('intltool') -groups=('gnome') +groups=('gnome' 'gnome-minimal') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') -Finclude gnome -Fconfopts="$Fconfopts --disable-gtk-doc" +_F_gnome_doc="y" +Finclude gnome gnome-scriptlet sha1sums=('ad5ca756c699a703ae8441646e40459ad95dfd47') # optimization OK diff --cc source/gnome/libgnomekbd/FrugalBuild index 8d9fcea,da78770..780aac6 --- a/source/gnome/libgnomekbd/FrugalBuild +++ b/source/gnome/libgnomekbd/FrugalBuild @@@ -8,8 -8,8 +8,8 @@@ pkgdesc="Keyboard library for GNOME url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'dbus-glib>=0.76' 'gtk+3' 'libxklavier>=5.0') makedepends=('intltool' 'perl-xml-parser' 'gobject-introspection') -groups=('gnome') +groups=('gnome' 'gnome-minimal') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') _F_gnome_glib="y" Finclude gnome gnome-scriptlet sha1sums=('552bb4757f5331c8448b021c8aa26acfa9330c9f') diff --cc source/gnome/libgweather/FrugalBuild index 30203cc,4948114..d6fb736 --- a/source/gnome/libgweather/FrugalBuild +++ b/source/gnome/libgweather/FrugalBuild @@@ -8,8 -8,8 +8,8 @@@ pkgdesc="libgweather is a library to ac url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'gtk+3>=3.2.0' 'gconf>=3.1.92-2' 'libsoup-gnome>=2.34.0') makedepends=('perl-xml-parser' 'intltool' 'gobject-introspection') -groups=('gnome') +groups=('gnome' 'gnome-minimal') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/gweather.schemas') Finclude gnome gnome-scriptlet sha1sums=('15450d05253bab6eebcbcc5cc8b77e8a26d4f48b') diff --cc source/gnome/librest/FrugalBuild index fadd811,b25c29c..5d9d91e --- a/source/gnome/librest/FrugalBuild +++ b/source/gnome/librest/FrugalBuild @@@ -8,11 -8,10 +8,11 @@@ pkgrel= pkgdesc="This library was designed to make it easier to access web services" depends=('libsoup-gnome>=2.32.0' 'libxml2') makedepends=('gtk-doc' 'gobject-introspection') -groups=('gnome') +groups=('gnome' 'gnome-minimal') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') _F_gnome_devel="y" -Finclude gnome +_F_gnome_doc="y" +Finclude gnome gnome-scriptlet sha1sums=('64b121cc5f99223641e6d5445f8d3ba7ee566de5') # optimization OK diff --cc source/gnome/libsocialweb/FrugalBuild index 299e32f,154dd74..e97d20f --- a/source/gnome/libsocialweb/FrugalBuild +++ b/source/gnome/libsocialweb/FrugalBuild @@@ -7,11 -7,10 +7,11 @@@ pkgrel= pkgdesc="socialweb library to fetch data from social service" depends=('libxml2>=2.7.8' 'librest' 'json-glib' 'networkmanager>=0.8.995') makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'vala') -groups=('gnome') +groups=('gnome' 'gnome-minimal') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') _F_gnome_devel="y" -Finclude gnome +_F_gnome_doc="y" +Finclude gnome gnome-scriptlet source=($source lastfm flickr twitpic twitter) Fconfopts="$Fconfopts--with-gnome --with-online=networkmanager --disable-static \ --enable-introspection=yes \ diff --cc source/gnome/metacity/FrugalBuild index 6017c7d,11167da..5610a86 --- a/source/gnome/metacity/FrugalBuild +++ b/source/gnome/metacity/FrugalBuild @@@ -9,8 -9,8 +9,8 @@@ url="http://www.gnome.org/ depends=('libxml2>=2.7.8' 'startup-notification' 'gconf>=2.32.0' 'gnome-themes>=2.30.0' 'libcm' 'gnome-frugalware>=0.7.2' \ 'zenity>=3.0.0' 'libcanberra-gtk2' 'xcb-util>=0.3.8') makedepends=('intltool' 'gnome-doc-utils') -groups=('gnome') +groups=('gnome' 'gnome-minimal') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/metacity.schemas') Finclude gnome gnome-scriptlet source=(${source[@]} DisableUselessAlert.diff 06_Add_UXD_shadows_and_borders.patch) diff --cc source/gnome/polkit-gnome/FrugalBuild index ae0a35f,885c9f2..8746eeb --- a/source/gnome/polkit-gnome/FrugalBuild +++ b/source/gnome/polkit-gnome/FrugalBuild @@@ -7,11 -7,11 +7,11 @@@ pkgrel= pkgdesc="PolicyKit policies and configurations for the GNOME desktop" depends=('libxml2>=2.7.8' 'polkit>=0.100' 'gconf' 'gtk+3') makedepends=('intltool' 'gnome-doc-utils' 'gobject-introspection>=0.9.0') -groups=('gnome') +groups=('gnome' 'gnome-minimal') Finclude gnome - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') source=($source polkit-gnome-authentication-agent-1.desktop) -sha1sums=('18a649503b4b00310d7597c6bd55f91eb199ee4a' \ +sha1sums=('1b9fe63657c5d22b327c729c8b60037b2ced676b' \ '93d1f9a7d068dd8e70c930abea9acf5b770a3485') Fconfopts="${Fconfopts[@]} --disable-gtk-doc --with-gtk=3.0" replaces=('gnome-policykit') diff --cc source/gnome/seahorse-sharing/FrugalBuild index 0c2a7f9,dd84d14..d1d9ae1 --- a/source/gnome/seahorse-sharing/FrugalBuild +++ b/source/gnome/seahorse-sharing/FrugalBuild @@@ -8,9 -8,9 +8,9 @@@ pkgdesc="Seahorse Sharing is a daemon w depends=('gtk+3' 'gpgme' 'libsoup-gnome' 'avahi-glib') makedepends=('intltool' 'gobject-introspection') groups=('gnome') - archs=('i686' 'x86_64' 'ppc') +_F_gnome_doc="y" +Finclude gnome gnome-scriptlet + archs=('i686' 'x86_64') -Finclude gnome -Fconfopts="$Fconfopts --disable-gtk-doc" sha1sums=('20b30ac38441a40217eeaae9ed19cf49a6f2f315') build(){ diff --cc source/gnome/yelp-xsl/FrugalBuild index a2de4d7,1d297f2..d8687d7 --- a/source/gnome/yelp-xsl/FrugalBuild +++ b/source/gnome/yelp-xsl/FrugalBuild @@@ -8,6 -8,6 +8,6 @@@ pkgdesc="TXSL stylesheets for the yelp depends=('libxml2' 'libxslt') makedepends=('intltool' 'itstool') groups=('gnome') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') Finclude gnome -sha1sums=('9d2adc3ac45c5c2e88979a4a5737ab21a7b64543') +sha1sums=('89e26807b30d50acb93891654791acacdbfd12c7') diff --cc source/gnome/zenity/FrugalBuild index def4945,941ba53..261a992 --- a/source/gnome/zenity/FrugalBuild +++ b/source/gnome/zenity/FrugalBuild @@@ -9,10 -9,9 +9,10 @@@ url="http://www.gnome.org/ rodepends=('notification-daemon') depends=('libxml2>=2.7.8' 'gtk+3' 'rarian' 'libnotify>=0.7' 'dbus-glib>=0.71-2') makedepends=('intltool' 'gnome-doc-utils>=0.10.3') -groups=('gnome') +groups=('gnome' 'gnome-minimal') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') _F_gnome_scrollkeeper="y" +_F_gnome_doc="y" Finclude gnome gnome-scriptlet sha1sums=('2518c3e0fa5fd4f33d68e7705f3f3730da55a3f0') Fconfopts="$Fconfopts --with-gtk=3.0" diff --cc source/kde-extra/okular/FrugalBuild index bb31d32,3ca544b..792450e --- a/source/kde-extra/okular/FrugalBuild +++ b/source/kde-extra/okular/FrugalBuild @@@ -2,9 -2,9 +2,9 @@@ # Maintainer: centuri0 <achevaux at gmail dot com> pkgname=okular -pkgrel=1 +pkgrel=2 pkgdesc="KDE universal document viewer." - groups=('kde-extra') + groups=('kde-extra' 'kde-minimal') archs=('i686' 'x86_64') Finclude kde depends=("kdelibs-core>=$_F_kde_ver" "kdelibs-interfaces>=$_F_kde_ver" "libthreadweaver>=$_F_kde_ver" "libkdesu>=$_F_kde_ver" \ diff --cc source/lib/libsoup/FrugalBuild index 86e5880,36e8952..713b905 --- a/source/lib/libsoup/FrugalBuild +++ b/source/lib/libsoup/FrugalBuild @@@ -10,9 -10,9 +10,9 @@@ depends=('glib2>=2.31.0' 'gnutls>=2.12. 'glib-networking') makedepends=('gobject-introspection>=0.9.0') groups=('lib') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') Finclude gnome -sha1sums=('b59e6524e8a75cd57059d539e9d408b44129a198') +sha1sums=('d68250e4ec442500e35629093ba290bcb64479c9') subpkgs=("libsoup-gnome") subdescs=('libsoup with gconf support') diff --cc source/xapps-extra/gummi/FrugalBuild index e9c829d,d6c8646..b82d29a --- a/source/xapps-extra/gummi/FrugalBuild +++ b/source/xapps-extra/gummi/FrugalBuild @@@ -2,11 -2,11 +2,11 @@@ # Maintainer: jercel <jerce...@gmail.com> pkgname=gummi - pkgver=0.5.8 - pkgrel=4 + pkgver=0.6.1 + pkgrel=1 pkgdesc="Gummi is a LaTeX editor " url="http://gummi.midnightcoding.org/"; -depends=('gtkspell' 'poppler-glib>=0.18.0' 'gtksourceview' 'texlive') +depends=('gtkspell' 'poppler-glib>=0.18.1' 'gtksourceview' 'texlive') makedepends=('intltool') groups=('xapps-extra') archs=('x86_64' 'i686') diff --cc source/xlib-extra/libvirt/FrugalBuild index 910ab63,78ce173..1418918 --- a/source/xlib-extra/libvirt/FrugalBuild +++ b/source/xlib-extra/libvirt/FrugalBuild @@@ -2,12 -2,11 +2,12 @@@ # Maintainer: jercel <jerce...@gmail.com> pkgname=libvirt - pkgver=0.9.7 - pkgrel=2 + pkgver=0.9.8 + pkgrel=1 pkgdesc="libvirt is a library providing access to information from various virtualization tools" url="http://libvirt.org"; -depends=('libxml2' 'gnutls>=2.12.12' 'cyrus-sasl' 'parted>=3.0' 'lvm2' 'libnl' 'systemd' 'polkit') +depends=('libxml2' 'gnutls>=2.12.12' 'cyrus-sasl' 'parted>=3.0' \ + 'lvm2' 'libnl' 'systemd' 'polkit' 'udev' 'avahi' 'libpciaccess') rodepends=('dnsmasq' 'bridge-utils' 'iproute2') makedepends=('python' 'gtk-doc') groups=('xlib-extra') _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
