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@suse.cz + +- More spec file cleanups. + +------------------------------------------------------------------- +Thu Dec 14 13:52:53 CST 2006 - maw@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}.tar.bz2 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@suse.cz +- More spec file cleanups. +* Thu Dec 14 2006 - maw@suse.de +- Move to /usr +- Some specfile cleanup. * Fri Oct 13 2006 - danw@suse.de - Kill dead patches * Wed Sep 20 2006 - jhargadon@suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org