January 2007 - openSUSE Commits - openSUSE Mailing Lists

commit notification-daemon
by root＠Hilbert.suse.de 08 Jan '07

08 Jan '07

Hello community, here is the log from the commit of package notification-daemon checked in at Mon Jan 8 17:51:37 CET 2007. -------- --- GNOME/notification-daemon/notification-daemon.changes 2006-12-06 01:14:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/notification-daemon/notification-daemon.changes 2007-01-08 15:24:38.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 11 19:17:58 CET 2006 - sbrabec(a)suse.cz + +- Prefix changed to /usr. +- Spec file cleanup. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ notification-daemon.spec ++++++ --- /var/tmp/diff_new_pack.Yv7285/_old 2007-01-08 17:51:27.000000000 +0100 +++ /var/tmp/diff_new_pack.Yv7285/_new 2007-01-08 17:51:27.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package notification-daemon (Version 0.3.5) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -18,7 +18,7 @@ BuildRequires: dbus-1-devel dbus-1-glib %endif Version: 0.3.5 -Release: 23 +Release: 34 URL: http://www.galago-project.org/ Group: System/Daemons License: GNU General Public License (GPL) @@ -26,8 +26,10 @@ Source: %{name}-%{version}.tar.bz2 Patch: notification-daemon-drawing.patch Patch1: notification-daemon-default-theme.patch -Autoreqprov: on BuildRoot: %{_tmppath}/%{name}-%{version}-build +Autoreqprov: on + +%gconf_schemas_prereq %description D-BUS notification daemon. @@ -45,36 +47,40 @@ %build autoreconf -f -i +# needed for notification-daemon-0.3.5: export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -# Set paths properly to be able to communicate with D-BUS. -./configure \ - --prefix=/opt/gnome \ - --libexecdir=/opt/gnome/lib/%{name}-1.0 \ - --sysconfdir=/etc/opt/gnome \ - --datadir=/usr/share -make +%configure\ + --libexecdir=%{_prefix}/lib/%{name}-1.0\ + --disable-schemas-install +make %{?jobs:-j%jobs} %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -rm $RPM_BUILD_ROOT/opt/gnome/%_lib/notification-daemon-1.0/engines/libstandard.a -rm $RPM_BUILD_ROOT/opt/gnome/%_lib/notification-daemon-1.0/engines/libstandard.la +rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a +%find_gconf_schemas %clean rm -rf $RPM_BUILD_ROOT -%post -export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/notification-daemon.schemas >/dev/null +%pre -f %{name}.schemas_pre -%files +%posttrans -f %{name}.schemas_posttrans + +%preun -f %{name}.schemas_preun + +%files -f %{name}.schemas_list %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README -/etc/opt/gnome/gconf/schemas/*.schemas -/opt/gnome/lib/notification-daemon-* -/usr/share/dbus-1/services/*.service +%{_libdir}/%{name}-1.0 +%if "%{_libdir}" != "%{_prefix}/lib" +%{_prefix}/lib/%{name}-1.0 +%endif +%{_datadir}/dbus-1/services/*.service %changelog -n notification-daemon +* Mon Dec 11 2006 - sbrabec(a)suse.cz +- Prefix changed to /usr. +- Spec file cleanup. * Thu Nov 30 2006 - jhargadon(a)suse.de - removed unneeded files from package (#223690) * Thu Nov 30 2006 - sbrabec(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lvm2
by root＠Hilbert.suse.de 08 Jan '07

08 Jan '07

Hello community, here is the log from the commit of package lvm2 checked in at Mon Jan 8 17:50:48 CET 2007. -------- --- lvm2/lvm2.changes 2006-12-18 14:00:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/lvm2/lvm2.changes 2007-01-08 16:20:36.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 8 16:15:23 CET 2007 - fehr(a)suse.de + +- fix buggy pointer arithmetic (#232117) + +------------------------------------------------------------------- New: ---- fix_pointer_arithmetic.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lvm2.spec ++++++ --- /var/tmp/diff_new_pack.FLc780/_old 2007-01-08 17:48:39.000000000 +0100 +++ /var/tmp/diff_new_pack.FLc780/_new 2007-01-08 17:48:39.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package lvm2 (Version 2.02.17) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -21,13 +21,14 @@ %endif Autoreqprov: on Version: 2.02.17 -Release: 1 +Release: 5 Summary: LVM2 Tools Source: LVM2.%{version}.tar.bz2 Source1: lvm.conf Source2: boot.lvm Source3: sysconfig.lvm Patch: improve_probing.diff +Patch1: fix_pointer_arithmetic.diff Patch2: no-inc-audit.diff Patch3: no_buildroot_shared.diff Patch4: sys_mount_instead_linux_fs.diff @@ -44,6 +45,7 @@ %prep %setup -n LVM2.%{version} %patch +%patch1 %patch2 %patch3 %patch4 @@ -176,6 +178,8 @@ %{_mandir}/man8/vgsplit.8.gz %changelog -n lvm2 +* Mon Jan 08 2007 - fehr(a)suse.de +- fix buggy pointer arithmetic (#232117) * Mon Dec 18 2006 - fehr(a)suse.de - update to new version 2.02.17 Add missing pvremove error message when device doesn't exist. ++++++ fix_pointer_arithmetic.diff ++++++ --- lib/device/device.c +++ lib/device/device.c 2007/01/08 15:11:19 @@ -72,7 +72,7 @@ /* Check for msdos partition table */ part_magic = buf + PART_MAGIC_OFFSET/sizeof(buf[0]); if ((*part_magic == xlate16(PART_MAGIC))) { - part = (struct partition *) (buf + PART_OFFSET); + part = (struct partition *) (((unsigned char*)buf) + PART_OFFSET); for (p = 0; p < 4; p++, part++) { /* Table is invalid if boot indicator not 0 or 0x80 */ if ((part->boot_ind & 0x7f)) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libxklavier
by root＠Hilbert.suse.de 08 Jan '07

08 Jan '07

Hello community, here is the log from the commit of package libxklavier checked in at Mon Jan 8 17:48:33 CET 2007. -------- --- GNOME/libxklavier/libxklavier.changes 2006-11-16 19:45:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/libxklavier/libxklavier.changes 2006-12-19 11:55:20.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 19 11:54:11 CET 2006 - sbrabec(a)suse.cz + +- Spec file cleanup. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxklavier.spec ++++++ --- /var/tmp/diff_new_pack.U31075/_old 2007-01-08 17:46:54.000000000 +0100 +++ /var/tmp/diff_new_pack.U31075/_new 2007-01-08 17:46:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libxklavier (Version 3.0) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,13 +11,13 @@ # norootforbuild Name: libxklavier -BuildRequires: doxygen glib2-devel gnome-filesystem gtk-doc libxml2-devel pkgconfig xorg-x11-devel +BuildRequires: doxygen glib2-devel gtk-doc libxml2-devel pkg-config xorg-x11-devel License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Libraries/X11 Autoreqprov: on Version: 3.0 -Release: 21 -Summary: Library with X Keyboard Related Functions +Release: 34 +Summary: Additional Package Documentation. Source: %{name}-%{version}.tar.bz2 Patch: libxklavier-216201-kbd-layout-fix.patch URL: http://www.freedesktop.org/Software/LibXklavier @@ -35,7 +35,6 @@ %package devel Summary: Include Files and Libraries mandatory for Development. Group: Development/Libraries/X11 -Autoreqprov: on Requires: %{name} = %{version} glib2-devel libxml2-devel glibc-devel %(rpm -q --whatprovides XFree86-devel --queryformat '%{NAME}') %description devel @@ -48,55 +47,63 @@ -------- Sergey V. Udaltsov <svu(a)users.sourceforge.net> +%package doc +Summary: Library with X Keyboard Related Functions +Group: Development/Libraries/X11 +Requires: %{name} = %{version} + +%description doc +This library allows you to simplify XKB-related development. + + + +Authors: +-------- + Sergey V. Udaltsov <svu(a)users.sourceforge.net> + %prep %setup -q %patch %build -touch config.rpath -autoreconf --force --install -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ - ./configure \ - --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --sysconfdir=%{_sysconfdir} \ - --enable-doxygen \ - --with-xkb-base=/usr/share/X11/xkb -make %{?jobs:-j%jobs} doc_to=%{_defaultdocdir}/%{name}/html +# needed for libxklavier-3.0 and openSUSE 10.2: +cp /usr/share/gettext/config.rpath . +autoreconf -f -i +%configure +make %{?jobs:-j%jobs} %install -rm -rf $RPM_BUILD_ROOT -make doc_to=%{_defaultdocdir}/%{name}/html install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} -cp AUTHORS COPYING COPYING.LIB CREDITS ChangeLog NEWS README $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} +make install DESTDIR=$RPM_BUILD_ROOT %post %run_ldconfig +%postun +%run_ldconfig + %clean rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) -%doc %dir %{_defaultdocdir}/%{name} -%doc %{_defaultdocdir}/%{name}/[A-Z]* %defattr (-, root, root) -%{_libdir}/lib*.so.* -%{_prefix}/share/libxklavier -%dir /usr/share/gtk-doc -%dir /usr/share/gtk-doc/html -%dir /usr/share/gtk-doc/html/libxklavier -/usr/share/gtk-doc/html/libxklavier/*.* +%doc AUTHORS COPYING COPYING.LIB CREDITS ChangeLog NEWS README +%{_datadir}/libxklavier +%{_libdir}/*.so.* %files devel -%defattr(-,root,root,-) -#%doc %{_defaultdocdir}/%{name}/html -%{_libdir}/lib*.so -%{_libdir}/lib*.*a +%defattr (-, root, root) +%{_includedir}/* +%{_libdir}/*.so +%{_libdir}/*.*a %{_libdir}/pkgconfig/*.pc -%{_prefix}/include/* + +%files doc +%defattr (-, root, root) +%{_datadir}/gtk-doc/html/libxklavier %changelog -n libxklavier +* Tue Dec 19 2006 - sbrabec(a)suse.cz +- Spec file cleanup. * Thu Nov 16 2006 - danw(a)suse.de - Add patch from CVS to fix a crash in the keyboard layout indicator [#216201] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libsexy
by root＠Hilbert.suse.de 08 Jan '07

08 Jan '07

Hello community, here is the log from the commit of package libsexy checked in at Mon Jan 8 17:46:47 CET 2007. -------- --- GNOME/libsexy/libsexy.changes 2006-01-27 02:08:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/libsexy/libsexy.changes 2006-12-12 12:43:35.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Dec 12 12:43:07 CET 2006 - sbrabec(a)suse.cz + +- Prefix changed to /usr. +- Spec file cleanup. + +------------------------------------------------------------------- Old: ---- libsexy-0.1.5.tar.gz New: ---- libsexy-0.1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsexy.spec ++++++ --- /var/tmp/diff_new_pack.y27884/_old 2007-01-08 17:46:10.000000000 +0100 +++ /var/tmp/diff_new_pack.y27884/_new 2007-01-08 17:46:10.000000000 +0100 @@ -1,24 +1,24 @@ # # spec file for package libsexy (Version 0.1.5) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: libsexy -BuildRequires: gtk2-devel libxml2-devel popt-devel update-desktop-files +BuildRequires: gtk2-devel iso-codes-devel libxml2-devel popt-devel update-desktop-files Version: 0.1.5 -Release: 5 +Release: 46 URL: http://www.chipx86.com/wiki/Libsexy Group: Development/Libraries/GNOME -License: LGPL +License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Summary: Extended Widgets for GTK+ -Source: %{name}-%{version}.tar.gz +Source: %{name}-%{version}.tar.bz2 Autoreqprov: on Requires: iso-codes BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,15 +52,13 @@ %setup %build +autoreconf -f -i +# needed for libsexy-0.1.5: export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -#./configure\ -./autogen.sh\ - --prefix=/opt/gnome\ - --libdir=/opt/gnome/%{_lib} -make +%configure +make %{?jobs:-j%jobs} %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %clean @@ -75,16 +73,19 @@ %files %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README -/opt/gnome/%{_lib}/*.so.* +%{_libdir}/*.so.* %files devel %defattr (-, root, root) -/opt/gnome/%{_lib}/*.*a -/opt/gnome/%{_lib}/*.so -/opt/gnome/%{_lib}/pkgconfig/*.pc -/opt/gnome/include/* +%{_includedir}/* +%{_libdir}/*.*a +%{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc %changelog -n libsexy +* Tue Dec 12 2006 - sbrabec(a)suse.cz +- Prefix changed to /usr. +- Spec file cleanup. * Fri Jan 27 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Jan 25 2006 - sbrabec(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libmtp
by root＠Hilbert.suse.de 08 Jan '07

08 Jan '07

Hello community, here is the log from the commit of package libmtp checked in at Mon Jan 8 17:46:04 CET 2007. -------- --- libmtp/libmtp.changes 2006-12-02 12:47:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/libmtp/libmtp.changes 2007-01-08 16:38:04.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Jan 8 16:37:42 CET 2007 - meissner(a)suse.de + +- Upgraded to 0.1.2: + - new devices + - lots of bugfixes, rewritten lowlevel + communications layer. + +------------------------------------------------------------------- Old: ---- libmtp-0.1.0.tar.bz2 New: ---- libmtp-0.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmtp.spec ++++++ --- /var/tmp/diff_new_pack.t27166/_old 2007-01-08 17:45:44.000000000 +0100 +++ /var/tmp/diff_new_pack.t27166/_new 2007-01-08 17:45:44.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libmtp (Version 0.1.0) +# spec file for package libmtp (Version 0.1.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -18,7 +18,7 @@ Autoreqprov: on Requires: libusb Summary: Access to MTP Players -Version: 0.1.0 +Version: 0.1.2 Release: 1 Source0: %name-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,8 +50,8 @@ %install make install DESTDIR=$RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/usr/share/hal/fdi/information/10freedesktop/ -install -c -m 644 libmtp.fdi $RPM_BUILD_ROOT/usr/share/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi +install -d $RPM_BUILD_ROOT/usr/share/hal/fdi/information/20thirdparty/ +install -c -m 644 libmtp.fdi $RPM_BUILD_ROOT/usr/share/hal/fdi/information/20thirdparty/10-usb-music-players-libmtp.fdi %files %defattr(-, root, root) @@ -63,10 +63,15 @@ %dir /usr/share/hal %dir /usr/share/hal/fdi %dir /usr/share/hal/fdi/information -%dir /usr/share/hal/fdi/information/10freedesktop/ -/usr/share/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi +%dir /usr/share/hal/fdi/information/20thirdparty/ +/usr/share/hal/fdi/information/20thirdparty/10-usb-music-players-libmtp.fdi %changelog -n libmtp +* Mon Jan 08 2007 - meissner(a)suse.de +- Upgraded to 0.1.2: + - new devices + - lots of bugfixes, rewritten lowlevel + communications layer. * Sat Dec 02 2006 - meissner(a)suse.de - Upgraded to 0.1.0: - new devices ++++++ libmtp-0.1.0.tar.bz2 -> libmtp-0.1.2.tar.bz2 ++++++ ++++ 18630 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libgphoto2
by root＠Hilbert.suse.de 08 Jan '07

08 Jan '07

Hello community, here is the log from the commit of package libgphoto2 checked in at Mon Jan 8 17:45:37 CET 2007. -------- --- GNOME/libgphoto2/libgphoto2.changes 2006-12-05 15:05:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/libgphoto2/libgphoto2.changes 2007-01-08 17:38:48.547432000 +0100 @@ -1,0 +2,8 @@ +Mon Jan 8 16:40:31 CET 2007 - meissner(a)suse.de + +- upgraded to 2.3.1.3.trunk. + - large parts of PTP2 driver rewritten. + - possibility to download data without need + to keep it in memory. + +------------------------------------------------------------------- Old: ---- libgphoto2-2.3.0.tar.bz2 New: ---- libgphoto2-2.3.1.3.trunk.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgphoto2.spec ++++++ --- /var/tmp/diff_new_pack.r26099/_old 2007-01-08 17:44:46.000000000 +0100 +++ /var/tmp/diff_new_pack.r26099/_new 2007-01-08 17:44:46.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libgphoto2 (Version 2.3.0) +# spec file for package libgphoto2 (Version 2.3.1.3.trunk) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -14,20 +14,17 @@ BuildRequires: doxygen gcc-c++ hal-devel libexif libjpeg-devel mDNSResponder-devel mDNSResponder-lib URL: http://gphoto.org/ %define prefix /usr -License: GNU Library General Public License v. 2.0 and 2.1 (LGPL), Other License(s), see package +License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Hardware/Other Summary: A Digital Camera Library -Version: 2.3.0 +Version: 2.3.1.3.trunk Release: 1 Source0: libgphoto2-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: udev resmgr -%if %suse_version > 920 -Requires: hal -%endif %package devel Summary: Development headers for libgphoto2 -License: GNU Library General Public License v. 2.0 and 2.1 (LGPL), Other License(s), see package +License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Hardware/Other Requires: libgphoto2 = %version libusb libexif @@ -177,19 +174,22 @@ %if %suse_version >= 1000 # Check the installed hal (in neededforbuild) if the directory # is still at the place we expect to avoid surprises. - if [ ! -d /usr/share/hal/fdi/information/10freedesktop/ ] ; then + if [ ! -d /usr/share/hal/fdi/information/20thirdparty/ ] ; then echo "*** The hal FDI file location has changed. Fix the build." exit 1 fi - install -m 0755 -d $RPM_BUILD_ROOT/usr/share/hal/fdi/information/10freedesktop/ - ./print-camera-list hal-fdi > $RPM_BUILD_ROOT/usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi - # ./print-camera-list hal-fdi-dev > $RPM_BUILD_ROOT/usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2-device.fdi - if [ ! -s $RPM_BUILD_ROOT/usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi ]; then + install -m 0755 -d $RPM_BUILD_ROOT/usr/share/hal/fdi/information/20thirdparty/ + ./print-camera-list hal-fdi > $RPM_BUILD_ROOT/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi + # ./print-camera-list hal-fdi-dev > $RPM_BUILD_ROOT/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2-device.fdi + if [ ! -s $RPM_BUILD_ROOT/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi ]; then echo "*** Did not generate a fdi map. Check the build." exit 1 fi %endif popd +# udev helpers not used here. +rm $RPM_BUILD_ROOT/usr/lib/udev/check-mtp-device +rm $RPM_BUILD_ROOT/usr/lib/udev/check-ptp-camera mv doc/doxygen-output/libgphoto2-api.html apidocs %clean @@ -210,8 +210,8 @@ %{_mandir}/man3/libgphoto2.3* %{_mandir}/man3/libgphoto2_port.3* %if %suse_version >= 1000 -/usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi -# /usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2-device.fdi +/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi +# /usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2-device.fdi %endif %files devel @@ -231,6 +231,11 @@ %run_ldconfig %changelog -n libgphoto2 +* Mon Jan 08 2007 - meissner(a)suse.de +- upgraded to 2.3.1.3.trunk. + - large parts of PTP2 driver rewritten. + - possibility to download data without need + to keep it in memory. * Tue Dec 05 2006 - meissner(a)suse.de - upgraded to 2.3.0 final. - some new ids ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-spell2
by root＠Hilbert.suse.de 08 Jan '07

08 Jan '07

Hello community, here is the log from the commit of package gnome-spell2 checked in at Mon Jan 8 17:44:39 CET 2007. -------- --- GNOME/gnome-spell2/gnome-spell2.changes 2007-01-08 00:21:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-spell2/gnome-spell2.changes 2007-01-08 14:08:07.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 8 14:07:50 CET 2007 - sbrabec(a)suse.cz + +- Spec file cleanup. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-spell2.spec ++++++ --- /var/tmp/diff_new_pack.R22824/_old 2007-01-08 17:43:45.000000000 +0100 +++ /var/tmp/diff_new_pack.R22824/_new 2007-01-08 17:43:45.000000000 +0100 @@ -14,14 +14,12 @@ BuildRequires: aspell-devel gnome-common intltool libglade2-devel libgnomeui-devel libidl URL: http://www.gnome.org/ %define _name gnome-spell -%define prefix /usr -%define sysconfdir /etc License: GNU General Public License (GPL) Group: Development/Libraries/GNOME Autoreqprov: on Obsoletes: bonobo-conf Version: 1.0.7 -Release: 36 +Release: 38 Summary: Bonobo Spelling Component BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/1.0/%{_name}-%{version}.tar.… @@ -37,29 +35,18 @@ %prep %setup -q -n %{_name}-%{version} +rm po/no.* +sed -i "s/$ALL_LINGUAS.*$ no /\1 /" configure.in %build -rename no nb po/no.* -sed "s/$ALL_LINGUAS.*$ no /\1 nb /" configure.in > configure.in.tmp && mv configure.in.tmp configure.in -%{suse_update_config} autoreconf -f -i -CFLAGS="$RPM_OPT_FLAGS" \ - ./configure \ - --prefix=%prefix \ - --libdir=%prefix/%_lib \ - --sysconfdir=%sysconfdir \ - --datadir=%prefix/share \ - --localstatedir=/var/lib \ - --disable-static -make clean -make +%configure +make %{?jobs:-j%jobs} %install -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL -rm $RPM_BUILD_ROOT%{prefix}/%{_lib}/gnome-spell/*.*a %find_lang %{_name}-%{version} +rm $RPM_BUILD_ROOT%{_libdir}/*/*.*a %clean rm -rf $RPM_BUILD_ROOT @@ -67,17 +54,18 @@ %files -f %{_name}-%{version}.lang %defattr(-,root,root) %doc AUTHORS COPYING README NEWS ChangeLog -%{prefix}/%{_lib}/bonobo/servers/*.server -#%{prefix}/%{_lib}/gnome-spell/*.*a -%dir %{prefix}/share/control-center-2.0 -%dir %{prefix}/share/control-center-2.0/icons -%{prefix}/share/control-center-2.0/icons/*.png -%{prefix}/share/%{_name}-%{version} -%{prefix}/share/idl/*.idl -%dir %{prefix}/%{_lib}/gnome-spell -%{prefix}/%{_lib}/gnome-spell/*.so* +# NOTE: Own these directories to not depend on control-center2 +%dir %{_datadir}/control-center-2.0 +%dir %{_datadir}/control-center-2.0/icons +%{_datadir}/control-center-2.0/icons/*.png +%{_datadir}/%{_name}-%{version} +%{_datadir}/idl/*.idl +%{_libdir}/bonobo/servers/*.server +%{_libdir}/gnome-spell %changelog -n gnome-spell2 +* Mon Jan 08 2007 - sbrabec(a)suse.cz +- Spec file cleanup. * Mon Jan 08 2007 - ro(a)suse.de - GNOME moved to /usr * Thu Oct 19 2006 - jhargadon(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-pilot-conduits
by root＠Hilbert.suse.de 08 Jan '07

08 Jan '07

Hello community, here is the log from the commit of package gnome-pilot-conduits checked in at Mon Jan 8 17:43:39 CET 2007. -------- --- GNOME/gnome-pilot-conduits/gnome-pilot-conduits.changes 2006-10-13 18:12:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-pilot-conduits/gnome-pilot-conduits.changes 2007-01-08 17:09:50.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 8 17:09:47 CET 2007 - sbrabec(a)suse.cz + +- Prefix changed to /usr. +- Spec file cleanup. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-pilot-conduits.spec ++++++ --- /var/tmp/diff_new_pack.c22196/_old 2007-01-08 17:43:10.000000000 +0100 +++ /var/tmp/diff_new_pack.c22196/_new 2007-01-08 17:43:10.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-pilot-conduits (Version 2.0.14) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,15 +11,15 @@ # norootforbuild Name: gnome-pilot-conduits -BuildRequires: gnome-pilot-devel gnutls-devel libglade2-devel libgnomeprintui-devel libwnck-devel mDNSResponder-devel update-desktop-files +BuildRequires: gnome-pilot-devel Version: 2.0.14 -Release: 6 +Release: 38 URL: http://www.gnome.org/ Group: System/GUI/GNOME -License: GPL, Other License(s), see package +License: GNU General Public License (GPL) Summary: A Collection of Additional Pilot Conduits for GNOME Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/2.0/%{name}-%{version}.tar.bz2 -Patch4: %name-disable-mal.patch +Patch4: %{name}-disable-mal.patch Autoreqprov: on # Has biarch problems: # http://bugzilla.gnome.org/show_bug.cgi?id=302727 @@ -38,56 +38,33 @@ -------- Eskil Heyn Olsen <deity(a)eskil.dk> -%package devel -Group: System/GUI/GNOME -Summary: A Collection of Additional Pilot Conduits for GNOME -Requires: %name = %version - -%description devel -Gnome-pilot is a collection of programs and a daemon for integrating -GNOME and the Palm Pilot<tm>. - -This is a collection of additional conduits for gnome-pilot. - - - -Authors: --------- - Eskil Heyn Olsen <deity(a)eskil.dk> - %prep %setup %patch4 %build -autoreconf -I /opt/gnome/share/aclocal --force --install -export CFLAGS="$RPM_OPT_FLAGS" -./configure\ - --prefix=/opt/gnome\ - --libdir=/opt/gnome/%{_lib} -make +%configure +make %{?jobs:-j%jobs} %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %find_lang %{name} +rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a %clean rm -rf $RPM_BUILD_ROOT -%post - %files -f %{name}.lang %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README -/opt/gnome/%{_lib}/gnome-pilot/conduits/*.so -/opt/gnome/share/gnome-pilot/conduits/* - -%files devel -%defattr (-, root, root) -/opt/gnome/%{_lib}/gnome-pilot/conduits/*.*a +%{_libdir}/gnome-pilot/conduits/*.so +%{_datadir}/gnome-pilot/conduits/* +%{_datadir}/pixmaps/*.png %changelog -n gnome-pilot-conduits +* Mon Jan 08 2007 - sbrabec(a)suse.cz +- Prefix changed to /usr. +- Spec file cleanup. * Fri Oct 13 2006 - danw(a)suse.de - Remove dead patches * Thu Sep 21 2006 - jhargadon(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-pilot
by root＠Hilbert.suse.de 08 Jan '07

08 Jan '07

Hello community, here is the log from the commit of package gnome-pilot checked in at Mon Jan 8 17:43:04 CET 2007. -------- --- GNOME/gnome-pilot/gnome-pilot.changes 2006-10-13 18:07:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-pilot/gnome-pilot.changes 2007-01-04 12:30:02.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Jan 4 12:29:38 CET 2007 - sbrabec(a)suse.cz + +- More spec file cleanups. + +------------------------------------------------------------------- +Thu Dec 14 13:52:53 CST 2006 - maw(a)suse.de + +- Move to /usr +- Some specfile cleanup. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-pilot.spec ++++++ --- /var/tmp/diff_new_pack.K21624/_old 2007-01-08 17:42:54.000000000 +0100 +++ /var/tmp/diff_new_pack.K21624/_new 2007-01-08 17:42:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-pilot (Version 2.0.14) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -13,17 +13,13 @@ Name: gnome-pilot BuildRequires: fam gcc-c++ gnome-icon-theme gnome-panel-devel gob2 intltool kdelibs3-doc libidl perl-XML-Parser pilot-link-devel scrollkeeper shared-mime-info update-desktop-files URL: http://www.gnome.org -%define prefix /opt/gnome -%define sysconfdir /etc%{prefix} -License: GPL +License: GNU General Public License (GPL) Group: System/GUI/GNOME -Autoreqprov: on -PreReq: filesystem gconf2 shared-mime-info # Has biarch problems: # http://bugzilla.gnome.org/show_bug.cgi?id=302727 Conflicts: gnome-pilot-32bit Version: 2.0.14 -Release: 6 +Release: 36 Summary: GNOME PalmPilot Programs Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-pilot/2.0/%{name}-%{version}.ta… Patch: gnome-pilot-no-susepath.patch @@ -31,6 +27,9 @@ Patch2: gnome-pilot-non-void-returns.patch Patch7: gnome-pilot-hal.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +Autoreqprov: on + +%gconf_schemas_prereq %description gnome-pilot is a collection of programs and daemon for integrating @@ -71,91 +70,83 @@ sed -i s:@prefix@/lib:@prefix@/%_lib:g conduits/*/*.conduit.in %build -autoreconf -I /opt/gnome/share/aclocal --force --install +autoreconf -f -i CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ -./configure --with-gnome=/opt/gnome --prefix=%{prefix} \ - --libdir=%{prefix}/%_lib \ - --mandir=%{prefix}/share/man \ - --libexecdir=%{prefix}/lib/gnome-pilot \ - --sysconfdir=%{sysconfdir} \ - --with-pisock=/usr \ - --with-pisock-lib=/usr/%_lib -make +# FIXME: Build as root modifies system! +# gnome-pilot-2.0.14: --disable-scrollkeeper does not work properly. +%configure\ + --libexecdir=%{_prefix}/lib/gnome-pilot\ + --disable-scrollkeeper\ + --with-pisock=%{_prefix}\ + --with-pisock-lib=%{_libdir} +make %{?jobs:-j%jobs} %install -rm -rf $RPM_BUILD_ROOT -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -make -s install DESTDIR=$RPM_BUILD_ROOT -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL -gzip -9nf $RPM_BUILD_ROOT%{prefix}/share/man/man?/*.? -for xml in $RPM_BUILD_ROOT%{prefix}/share/gnome/help/*/*/*.xml; do +make install DESTDIR=$RPM_BUILD_ROOT +for xml in $RPM_BUILD_ROOT%{_datadir}/gnome/help/*/*/*.xml; do if echo $xml | egrep 'share/gnome/help/([^/]*)/[^/]*/\1\.xml$' > /dev/null; then meinproc --check --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || : fi done -mkdir -p $RPM_BUILD_ROOT%{prefix}/share/applications/ -#mv $RPM_BUILD_ROOT%{prefix}/share/control-center-2.0/capplets/*.desktop $RPM_BUILD_ROOT%{prefix}/share/applications/ -#rmdir $RPM_BUILD_ROOT%{prefix}/share/control-center-2.0/capplets -#rmdir $RPM_BUILD_ROOT%{prefix}/share/control-center-2.0 %suse_update_desktop_file -N "GNOME Pilot" -G "PalmOS Device Manager" -C "Configure PalmOS devices" -D "gnome-pilot" gpilotd-control-applet SystemSetup -%if %suse_version > 910 DESTDIR=$RPM_BUILD_ROOT mime-info-to-mime -%endif -cp /opt/gnome/share/icons/gnome/48x48/apps/palm-pilot-sync.png $RPM_BUILD_ROOT%{prefix}/share/pixmaps/ +%find_lang %{name} +%find_gconf_schemas +cat %{name}.lang %{name}.schemas_list >%{name}.lst +rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a + +%clean +rm -rf $RPM_BUILD_ROOT + +%pre -f %{name}.schemas_pre %post %run_ldconfig -export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/pilot.schemas >/dev/null -%if %suse_version > 910 -usr/bin/update-mime-database /usr/share/mime >/dev/null -%endif +if test -x usr/bin/update-mime-database ; then + usr/bin/update-mime-database usr/share/mime >/dev/null +fi + +%posttrans -f %{name}.schemas_posttrans + +%preun -f %{name}.schemas_preun %postun %run_ldconfig -%if %suse_version > 910 -usr/bin/update-mime-database /usr/share/mime >/dev/null -%endif +if test -x usr/bin/update-mime-database ; then + usr/bin/update-mime-database usr/share/mime >/dev/null +fi -%clean -rm -rf $RPM_BUILD_ROOT - -%files +%files -f %{name}.lst %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README -%{sysconfdir}/gconf/schemas/pilot.schemas -%{prefix}/bin/* -%{prefix}/%_lib/bonobo/servers/*.server -%dir %{prefix}/%_lib/gnome-pilot -%if "%_lib" != "lib" -%dir %{prefix}/lib/gnome-pilot -%endif -%{prefix}/lib/gnome-pilot/g* -%dir %{prefix}/%_lib/gnome-pilot/conduits -%{prefix}/%_lib/gnome-pilot/conduits/*.so -%{prefix}/%_lib/lib*.so.* -%doc %{prefix}/share/man/*/*.* -%{prefix}/share/applications/*.desktop -%{prefix}/share/gnome/help/* -%{prefix}/share/gnome-pilot -%{prefix}/share/idl/*.idl -%{prefix}/share/locale/*/LC_MESSAGES/*.mo -%{prefix}/share/mime-info/*.* -%{prefix}/share/omf/* -%{prefix}/share/pixmaps/*.png -%if %suse_version > 910 -/usr/share/mime/packages/*.xml +%{_bindir}/* +%{_libdir}/*.so.* +%{_libdir}/bonobo/servers/*.server +%{_libdir}/gnome-pilot +%if "%{_libdir}" != "%{_prefix}/lib" +%{_prefix}/lib/gnome-pilot %endif +%{_datadir}/applications/*.desktop +%{_datadir}/gnome-pilot +%{_datadir}/idl/*.idl +%{_datadir}/mime/packages/*.xml +%{_datadir}/omf/* +%{_datadir}/pixmaps/*.png +%doc %{_mandir}/man?/*.* %files devel %defattr(-, root, root) -%{prefix}/include/* -%{prefix}/%_lib/lib*.*a -%{prefix}/%_lib/lib*.so -%{prefix}/%_lib/gnome-pilot/conduits/*.*a -%{prefix}/%_lib/pkgconfig/*.pc +%{_includedir}/* +%{_libdir}/*.so +%{_libdir}/*.*a +%{_libdir}/pkgconfig/*.pc %changelog -n gnome-pilot +* Thu Jan 04 2007 - sbrabec(a)suse.cz +- More spec file cleanups. +* Thu Dec 14 2006 - maw(a)suse.de +- Move to /usr +- Some specfile cleanup. * Fri Oct 13 2006 - danw(a)suse.de - Kill dead patches * Wed Sep 20 2006 - jhargadon(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-panel
by root＠Hilbert.suse.de 08 Jan '07

08 Jan '07

Hello community, here is the log from the commit of package gnome-panel checked in at Mon Jan 8 17:42:48 CET 2007. -------- --- GNOME/gnome-panel/gnome-panel.changes 2006-12-28 19:41:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-panel/gnome-panel.changes 2007-01-08 10:29:00.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Jan 8 10:28:50 CET 2007 - sbrabec(a)suse.cz + +- More spec file cleanups. + +------------------------------------------------------------------- +Mon Jan 8 10:28:38 CET 2007 - maw(a)suse.de + +- Move to /usr +- Some specfile cleanup. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-panel.spec ++++++ --- /var/tmp/diff_new_pack.B19328/_old 2007-01-08 17:42:02.000000000 +0100 +++ /var/tmp/diff_new_pack.B19328/_new 2007-01-08 17:42:02.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-panel (Version 2.16.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,22 +11,20 @@ # norootforbuild Name: gnome-panel -BuildRequires: evolution-data-server-devel gnome-common gnome-desktop-devel gnome-doc-utils-devel gnome-menus-devel gnome-patch-translation gtkdoc intltool kdelibs3-doc libidl libwnck-devel mDNSResponder-devel perl-XML-Parser scrollkeeper -%define prefix /opt/gnome -%define sysconfdir /etc%{prefix} +BuildRequires: evolution-data-server-devel gnome-common gnome-desktop-devel gnome-doc-utils-devel gnome-icon-theme gnome-menus-devel gnome-patch-translation gtk-doc intltool kdelibs3-doc libidl libwnck-devel mDNSResponder-devel perl-XML-Parser scrollkeeper License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/GUI/GNOME -Autoreqprov: on Version: 2.16.1 -Release: 37 +Release: 41 Summary: The GNOME 2.x Desktop Panel -Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.16/gnome-panel-%{versio… +Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.16/%{name}-%{version}.t… URL: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: filesystem /usr/bin/touch gconf2 -Requires: control-center2 gnome-themes +Requires: gnome-themes gnome-icon-theme %if %suse_version > 1000 -Recommends: gnome-main-menu +Recommends: gnome-main-menu control-center2 +%else +Requires: control-center2 %endif Patch3: gnome-panel-layout.patch Patch5: gnome-panel-big-icons.patch @@ -57,6 +55,9 @@ Patch55: gnome-panel-202076-root-launchers.patch Patch56: gnome-panel-recently-used-apps.patch Obsoletes: gnome-core gnome-panel-nld +Autoreqprov: on + +%gconf_schemas_prereq %description This package contains the GNOME 2.x Desktop Panel. The panel is an @@ -94,16 +95,16 @@ Lennart Poettering <poettering(a)gmx.net> Wanda The Fish <wanda(a)gnome.org> -%package devel -Summary: Include Files and Libraries mandatory for Development. +%package extras +Summary: Extra panel applets Group: System/GUI/GNOME -Autoreqprov: on -Requires: %{name} = %{version} gtk2-devel libgnomeui-devel libbonoboui-devel libglade2-devel -Obsoletes: gnome-panel-nld-devel +Requires: %{name} = %{version} fortune +Obsoletes: gnome-panel-nld-extras -%description devel -This package contains all necessary include files and libraries needed -to develop applications that require these. +%gconf_schemas_prereq + +%description extras +This package contains extra panel applets such as Wanda the fish. @@ -136,15 +137,16 @@ Lennart Poettering <poettering(a)gmx.net> Wanda The Fish <wanda(a)gnome.org> -%package doc -Summary: Additional Package Documentation. +%package devel +Summary: Include Files and Libraries mandatory for Development. Group: System/GUI/GNOME -Requires: %{name} = %{version} -Obsoletes: gnome-panel-nld-doc +Autoreqprov: on +Requires: %{name} = %{version} gtk2-devel libgnomeui-devel libbonoboui-devel libglade2-devel +Obsoletes: gnome-panel-nld-devel -%description doc -This package contains optional documentation provided in addition to -this package's base documentation. +%description devel +This package contains all necessary include files and libraries needed +to develop applications that require these. @@ -177,14 +179,15 @@ Lennart Poettering <poettering(a)gmx.net> Wanda The Fish <wanda(a)gnome.org> -%package extras -Summary: Extra panel applets +%package doc +Summary: Additional Package Documentation. Group: System/GUI/GNOME -Requires: %{name} = %{version} fortune -Obsoletes: gnome-panel-nld-extras +Requires: %{name} = %{version} +Obsoletes: gnome-panel-nld-doc -%description extras -This package contains extra panel applets such as Wanda the fish. +%description doc +This package contains optional documentation provided in addition to +this package's base documentation. @@ -258,122 +261,145 @@ gnome-patch-translation-update %build -%{?suse_update_config:%{suse_update_config -f}} -autoreconf -f -i -CFLAGS="$RPM_OPT_FLAGS -I/opt/gnome/include -fno-strict-aliasing " \ - ./configure \ - --prefix=%prefix \ - --libdir=%prefix/%_lib \ - --sysconfdir=%sysconfdir \ - --libexecdir=%{prefix}/lib/gnome-applets \ - --mandir=%prefix/share/man \ - --localstatedir=/var/%_lib \ - --with-kde-datadir=/opt/kde3/share \ - --disable-scrollkeeper \ - --enable-platform-gnome2 \ - --with-in-process-applets=all -#pushd po; make %{name}*.pot; make update-po; popd -make +ACLOCAL="aclocal -I m4" autoreconf -f -i +# needed for gnome-panel-2.16.1: +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +# FIXME: Build as root modifies system! +# gnome-panel-2.16.1: --disable-scrollkeeper does not work properly. +%configure\ + --libexecdir=%{_prefix}/lib/gnome-panel\ + --with-in-process-applets=all\ + --disable-schemas-install\ + --disable-scrollkeeper +make %{?jobs:-j%jobs} %install -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -make -i install DESTDIR=$RPM_BUILD_ROOT -#remove the stuff we don't want -rm -rf $RPM_BUILD_ROOT/var/%_lib/scrollkeeper -rm -rf $RPM_BUILD_ROOT%{prefix}/%{_lib}/gnome-panel/lib*.*a -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL -gzip -9nf $RPM_BUILD_ROOT%{prefix}/share/man/man?/*.? -for xml in $RPM_BUILD_ROOT%{prefix}/share/gnome/help/*/*/*.xml; do +make install DESTDIR=$RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/gnome-panel +for xml in $RPM_BUILD_ROOT%{_datadir}/gnome/help/*/*/*.xml; do if echo $xml | egrep 'share/gnome/help/([^/]*)/[^/]*/\1\.xml$' > /dev/null; then meinproc --check --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || : fi done -%find_lang gnome-panel-2.0 +%find_lang %{name}-2.0 +%find_lang clock %{name}-2.0.lang +%find_lang fish %{name}-2.0.lang +%find_lang fish-applet-2 %{name}-2.0.lang +%find_lang window-list %{name}-2.0.lang +%find_lang workspace-switcher %{name}-2.0.lang + +%def_gconf_schemas %{name} + +%add_gconf_schemas clock + +%add_gconf_schemas panel-compatibility + +%add_gconf_schemas panel-general + +%add_gconf_schemas panel-global + +%add_gconf_schemas panel-object + +%add_gconf_schemas panel-toplevel + +%add_gconf_schemas window-list + +%add_gconf_schemas workspace-switcher + +%def_gconf_schemas %{name}-extras + +%add_gconf_schemas fish + +%end_gconf_schemas +# NOTE: GCONF_CONFIG_SOURCE is already set by %%posttrans code. +sed -i /GCONF_CONFIG_SOURCE/d %{name}.schemas_posttrans +cat %{name}-2.0.lang %{name}.schemas_list >%{name}.lst +rm $RPM_BUILD_ROOT%{_libdir}/*/*.*a + +%clean +rm -rf $RPM_BUILD_ROOT + +%pre -f %{name}.schemas_pre %post %run_ldconfig -export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/clock.schemas >/dev/null -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/panel-compatibility.schemas >/dev/null -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/panel-general.schemas >/dev/null -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/panel-global.schemas >/dev/null -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/panel-object.schemas >/dev/null -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/panel-toplevel.schemas >/dev/null -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/window-list.schemas >/dev/null -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/workspace-switcher.schemas >/dev/null -opt/gnome/bin/gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load etc/opt/gnome/gconf/schemas/panel-default-setup.entries -%post extras -%run_ldconfig -export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/fish.schemas >/dev/null +%posttrans -f %{name}.schemas_posttrans +export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` +usr/bin/gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load etc/gconf/schemas/panel-default-setup.entries >/dev/null + +%preun -f %{name}.schemas_preun +# Remove extra keys from panel-default-setup.entries. +# If it is an update, %%posttrans will install new schemas. +rm -rf etc/gconf/gconf.xml.schemas/apps/panel/default_setup %postun %run_ldconfig -%postun extras -%run_ldconfig +%pre extras -f %{name}-extras.schemas_pre -%clean -rm -rf $RPM_BUILD_ROOT +%posttrans extras -f %{name}-extras.schemas_posttrans -%files -f %files -f gnome-panel-2.0.lang +%preun extras -f %{name}-extras.schemas_preun + +%files -f %{name}.lst %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README %defattr (-, root, root) -%{prefix}/bin/* -%{prefix}/%{_lib}/libpanel*.so.* -%{prefix}/%{_lib}/bonobo/servers/GNOME_ClockApplet_Factory.server -%{prefix}/%{_lib}/bonobo/servers/GNOME_NotificationAreaApplet.server -%{prefix}/%{_lib}/bonobo/servers/GNOME_Panel.server -%{prefix}/%{_lib}/bonobo/servers/GNOME_Wncklet_Factory.server -%{prefix}/%{_lib}/%{name} -%{prefix}/%{_lib}/%{name}/libclock-applet.* -%{prefix}/%{_lib}/%{name}/libnotification-area-applet.* -%{prefix}/%{_lib}/%{name}/libwnck-applet.* -%{prefix}/share/gnome/help/* -%{prefix}/share/gnome/panel -%{prefix}/share/gnome-panelrc -%{prefix}/share/idl/* -%{prefix}/share/omf/* -%{prefix}/share/icons/* -%{sysconfdir}/gconf/schemas/clock.schemas -%{sysconfdir}/gconf/schemas/panel-compatibility.schemas -%{sysconfdir}/gconf/schemas/panel-default-setup.entries -%{sysconfdir}/gconf/schemas/panel-general.schemas -%{sysconfdir}/gconf/schemas/panel-global.schemas -%{sysconfdir}/gconf/schemas/panel-object.schemas -%{sysconfdir}/gconf/schemas/panel-toplevel.schemas -%{sysconfdir}/gconf/schemas/window-list.schemas -%{sysconfdir}/gconf/schemas/workspace-switcher.schemas -%doc %{prefix}/share/man/man*/* -%{prefix}/share/gnome-2.0/ui/GNOME_ClockApplet.xml -%{prefix}/share/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml -%{prefix}/share/gnome-2.0/ui/GNOME_Panel_Popup.xml -%{prefix}/share/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml -%{prefix}/share/gnome-2.0/ui/GNOME_WindowListApplet.xml -%{prefix}/share/gnome-2.0/ui/GNOME_WindowMenuApplet.xml -%{prefix}/share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml +%{_bindir}/* +%{_datadir}/gnome/panel +%{_datadir}/gnome-panelrc +%{_datadir}/gnome-2.0/ui/GNOME_ClockApplet.xml +%{_datadir}/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml +%{_datadir}/gnome-2.0/ui/GNOME_Panel_Popup.xml +%{_datadir}/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml +%{_datadir}/gnome-2.0/ui/GNOME_WindowListApplet.xml +%{_datadir}/gnome-2.0/ui/GNOME_WindowMenuApplet.xml +%{_datadir}/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml +%{_datadir}/icons/*/*/*/*.png +%{_datadir}/icons/*/*/*/*.svg +%{_datadir}/idl/* +%{_datadir}/omf/* +%{_libdir}/*.so.* +%{_libdir}/bonobo/servers/GNOME_ClockApplet_Factory.server +%{_libdir}/bonobo/servers/GNOME_NotificationAreaApplet.server +%{_libdir}/bonobo/servers/GNOME_Panel.server +%{_libdir}/bonobo/servers/GNOME_Wncklet_Factory.server +# generic directory for in-process applets +%dir %{_libdir}/gnome-panel +%if "%{_libdir}" != "%{_prefix}/lib" +# generic directory for normal applets +%dir %{_prefix}/lib/gnome-panel +%endif +%{_libdir}/gnome-panel/libclock-applet.so +%{_libdir}/gnome-panel/libnotification-area-applet.so +%{_libdir}/gnome-panel/libwnck-applet.so +%doc %{_mandir}/man?/*.* +%config %{_sysconfdir}/gconf/schemas/panel-default-setup.entries -%files devel +%files extras -f %{name}-extras.schemas_list %defattr (-, root, root) -%{prefix}/%_lib/pkgconfig/*.pc -%{prefix}/%{_lib}/libpanel-applet-2.so -%{prefix}/include/panel-2.0 -%{prefix}/%{_lib}/libpanel-applet-2.*a +%{_datadir}/gnome-2.0/ui/GNOME_FishApplet.xml +%{_libdir}/gnome-panel/libfish-applet-2.so +%{_libdir}/bonobo/servers/GNOME_FishApplet_Factory.server -%files doc +%files devel %defattr (-, root, root) -%{prefix}/share/gtk-doc/html/* +%{_includedir}/panel-2.0 +%{_libdir}/*.so +%{_libdir}/*.*a +%{_libdir}/pkgconfig/*.pc -%files extras +%files doc %defattr (-, root, root) -%{prefix}/%{_lib}/%{name}/libfish-applet-2.* -%{sysconfdir}/gconf/schemas/fish.schemas -%{prefix}/%{_lib}/bonobo/servers/GNOME_FishApplet_Factory.server -%{prefix}/share/gnome-2.0/ui/GNOME_FishApplet.xml +%{_datadir}/gtk-doc/html/* %changelog -n gnome-panel +* Mon Jan 08 2007 - sbrabec(a)suse.cz +- More spec file cleanups. +* Mon Jan 08 2007 - maw(a)suse.de +- Move to /usr +- Some specfile cleanup. * Thu Dec 28 2006 - jhargadon(a)suse.de - cleaned up the libtool files in the specfile (#223683) * Tue Nov 28 2006 - sbrabec(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0