Hello community, here is the log from the commit of package gnome-menus checked in at Tue Jan 9 17:44:15 CET 2007. -------- --- GNOME/gnome-menus/gnome-menus.changes 2006-11-21 16:20:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-menus/gnome-menus.changes 2007-01-09 17:03:14.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Jan 9 17:03:04 CET 2007 - sbrabec@suse.cz + +- More spec file cleanups. + +------------------------------------------------------------------- +Wed Dec 13 16:30:08 CST 2006 - maw@suse.de + +- Move to /usr +- Do some spec cleanup. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-menus.spec ++++++ --- /var/tmp/diff_new_pack.x16726/_old 2007-01-09 17:44:03.000000000 +0100 +++ /var/tmp/diff_new_pack.x16726/_new 2007-01-09 17:44:03.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-menus (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. # @@ -12,16 +12,14 @@ Name: gnome-menus BuildRequires: gnome-common gnome-patch-translation gnome-vfs2-devel intltool perl-XML-Parser python-devel python-gtk -%define prefix /opt/gnome -%define sysconfdir /etc License: GNU Free Documentation License, Version 1.1 (GFDL), GNU General Public License (GPL) Group: System/GUI/GNOME Autoreqprov: on Obsoletes: gnome-core Version: 2.16.1 -Release: 23 +Release: 37 Summary: The GNOME Desktop Menu -Source: gnome-menus-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.bz2 Source1: preferences.menu Source2: applications.menu Source3: Hidden.directory @@ -61,9 +59,7 @@ %package devel Summary: The GNOME Desktop Menu Group: System/GUI/GNOME -Autoreqprov: on -Requires: gnome-menus = %{version} -Requires: glib2-devel gnome-vfs2-devel +Requires: %{name} = %{version} glib2-devel gnome-vfs2-devel %description devel This package is free software and is part of the GNOME project. @@ -84,7 +80,7 @@ Mark McLoughlin %prep -%setup -n gnome-menus-%{version} +%setup -q gnome-patch-translation-prepare %patch -p1 %patch2 -p1 @@ -99,39 +95,39 @@ %build autoreconf -f -i -CFLAGS="$RPM_OPT_FLAGS" \ - ./configure \ - --prefix=%prefix \ - --libdir=%prefix/%_lib \ - --sysconfdir=%sysconfdir \ - --mandir=%prefix/share/man \ - --localstatedir=/var/lib \ - --with-kde-datadir=/opt/kde3 \ - --with-gnome-distributor="SUSE" \ - --enable-platform-gnome2 -make +%configure +# ./configure \ +# --prefix=%prefix \ +# --libdir=%{_libdir} \ +# --sysconfdir=%sysconfdir \ +# --mandir=%{_mandir} \ +# --localstatedir=/var/lib \ +# --with-kde-datadir=/opt/kde3 \ +# --with-gnome-distributor="SUSE" \ +# --enable-platform-gnome2 +make %{?jobs:-j%jobs} %install make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} -#for xml in $RPM_BUILD_ROOT%{prefix}/share/gnome/help/*/*/*.xml; do +#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 -mv $RPM_BUILD_ROOT%{sysconfdir}/xdg/menus/preferences.menu $RPM_BUILD_ROOT%{sysconfdir}/xdg/menus/preferences-gnome.menu -cp %{S:1} $RPM_BUILD_ROOT%{sysconfdir}/xdg/menus/ -rm $RPM_BUILD_ROOT%{sysconfdir}/xdg/menus/applications.menu -cp %{S:2} $RPM_BUILD_ROOT%{sysconfdir}/xdg/menus/applications.menu.gnome -cp %{S:3} $RPM_BUILD_ROOT%{prefix}/share/desktop-directories/ -cp %{S:4} $RPM_BUILD_ROOT%{sysconfdir}/xdg/menus/ -for dir in %prefix/%{_lib}/python%py_ver/site-packages ; do - find $RPM_BUILD_ROOT/$dir \( -name '*.py[co]' -o -name '*.la' \) -print0 | xargs -0 rm - python %_libdir/python%py_ver/compileall.py -d $dir $RPM_BUILD_ROOT/$dir - mkdir -p $RPM_BUILD_ROOT/%py_sitedir - mv $RPM_BUILD_ROOT/$dir/* $RPM_BUILD_ROOT/%py_sitedir/ -done -rm $RPM_BUILD_ROOT/%py_sitedir/gmenu.a +# mv $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/menus/preferences.menu $RPM_BUILD_ROOT%{sysconfdir}/xdg/menus/preferences-gnome.menu +cp %{S:1} $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/menus/ +rm $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/menus/applications.menu +cp %{S:2} $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/menus/applications.menu.gnome +cp %{S:3} $RPM_BUILD_ROOT/%{_datadir}/desktop-directories/ +cp %{S:4} $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/menus/ +#for dir in %{_libdir}/python%py_ver/site-packages ; do +# find $RPM_BUILD_ROOT/$dir \( -name '*.py[co]' -o -name '*.la' \) -print0 | xargs -0 rm +# python %_libdir/python%py_ver/compileall.py -d $dir $RPM_BUILD_ROOT/$dir +# mkdir -p $RPM_BUILD_ROOT/%py_sitedir +# #mv $RPM_BUILD_ROOT/$dir/* $RPM_BUILD_ROOT/%py_sitedir/ +#done +rm $RPM_BUILD_ROOT%{py_sitedir}/*.*a %clean rm -rf $RPM_BUILD_ROOT @@ -145,26 +141,30 @@ %files -f %files -f %{name}.lang %defattr (-, root, root) %doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README -%{prefix}/bin/* -#%dir %{sysconfdir}/xdg -%dir %{sysconfdir}/xdg/menus -%{sysconfdir}/xdg/menus/* -%dir %{prefix}/share/desktop-directories -%{prefix}/share/desktop-directories/*.directory -%{prefix}/share/applications/gmenu-simple-editor.desktop -%{prefix}/%_lib/lib*.so.* +%{_bindir}/* +%{_datadir}/applications/gmenu-simple-editor.desktop +%dir %{_datadir}/desktop-directories +%{_datadir}/desktop-directories/*.directory +%{_datadir}/gnome-menus +%{_libdir}/*.so.* +%dir %{_sysconfdir}/xdg/menus +%{_sysconfdir}/xdg/menus/* %{py_sitedir}/GMenuSimpleEditor %{py_sitedir}/gmenu.so -%{prefix}/share/gnome-menus %files devel %defattr (-, root, root) -%{prefix}/%_lib/pkgconfig/*.pc -%{prefix}/%_lib/lib*.so -%{prefix}/%_lib/lib*.*a -%{prefix}/include/gnome-menus +%{_includedir}/gnome-menus +%{_libdir}/*.so +%{_libdir}/*.*a +%{_libdir}/pkgconfig/*.pc %changelog -n gnome-menus +* Tue Jan 09 2007 - sbrabec@suse.cz +- More spec file cleanups. +* Wed Dec 13 2006 - maw@suse.de +- Move to /usr +- Do some spec cleanup. * Tue Nov 21 2006 - sbrabec@suse.cz - Do not explicitly require mDNSResponder-lib blocking avahi compat package. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org