Hello community, here is the log from the commit of package mergeant checked in at Wed Jan 10 19:06:40 CET 2007. -------- --- GNOME/mergeant/mergeant.changes 2006-01-25 21:32:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/mergeant/mergeant.changes 2007-01-04 11:46:03.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 4 11:45:54 CET 2007 - sbrabec@suse.cz + +- Prefix changed to /usr. +- Spec file cleanup. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mergeant.spec ++++++ --- /var/tmp/diff_new_pack.l24759/_old 2007-01-10 19:06:35.000000000 +0100 +++ /var/tmp/diff_new_pack.l24759/_new 2007-01-10 19:06:35.000000000 +0100 @@ -1,30 +1,27 @@ # # spec file for package mergeant (Version 0.62) # -# Copyright (c) 2005 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://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: mergeant -BuildRequires: docbook-toys docbook-xsl-stylesheets gcc-c++ gnutls-devel libgnomedb-devel libgnomeprintui-devel libwnck-devel mDNSResponder-devel perl-XML-Parser scrollkeeper update-desktop-files xmlcharent -%define prefix /opt/gnome -%define sysconfdir /etc%{prefix} -License: GPL +BuildRequires: docbook-toys docbook-xsl-stylesheets gcc-c++ gnutls-devel intltool libgnomedb-devel libgnomeprintui-devel libwnck-devel mDNSResponder-devel perl-XML-Parser scrollkeeper shared-mime-info update-desktop-files xmlcharent +License: GNU General Public License (GPL) Group: Productivity/Databases/Tools Autoreqprov: on Version: 0.62 -Release: 2 -Summary: Mergeant is a Database Admin Tool (Development Version) +Release: 54 +Summary: Mergeant--A Database Admin Tool (Development Version) BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://www.gnome-db.org/ Source: ftp://ftp.gnome.org/pub/gnome/sources/mergeant/0.61/%{name}-%{version}.tar.bz2 -Patch: %name-desktop.patch -PreReq: shared-mime-info +Patch: %{name}-desktop.patch %description Mergeant is a database admin tool that works with libgnomedb and @@ -43,47 +40,52 @@ %prep %setup -q %patch +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 > configure.tmp && \ - mv configure.tmp configure && chmod 755 configure -CFLAGS="$RPM_OPT_FLAGS" \ -./configure --sysconfdir=%sysconfdir \ - --prefix=%{prefix} \ - --libdir=%{prefix}/%_lib \ - --mandir=%{_mandir} -make +autoreconf -f -i +# FIXME: Build as root modifies system! +# mergeant-0.62: --disable-scrollkeeper does not work properly. +%configure\ + --disable-scrollkeeper +make %{?jobs:-j%jobs} %install make DESTDIR=$RPM_BUILD_ROOT install DESTDIR=$RPM_BUILD_ROOT mime-info-to-mime %suse_update_desktop_file %name System Database -ln -s mergeant/mergeant.png $RPM_BUILD_ROOT/opt/gnome/share/pixmaps/mergeant.png +ln -s mergeant/mergeant.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/mergeant.png %find_lang mergeant +rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info $RPM_BUILD_ROOT%{_datadir}/application-registry %clean rm -rf $RPM_BUILD_ROOT %post -usr/bin/update-mime-database /usr/share/mime >/dev/null +if test -x usr/bin/update-mime-database ; then + usr/bin/update-mime-database usr/share/mime >/dev/null +fi %postun -usr/bin/update-mime-database /usr/share/mime >/dev/null +if test -x usr/bin/update-mime-database ; then + usr/bin/update-mime-database usr/share/mime >/dev/null +fi %files -f mergeant.lang %defattr(-, root, root) %doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO -%{prefix}/bin/* -%{prefix}/share/application-registry/*.applications -%{prefix}/share/applications/*.desktop -%{prefix}/share/mime-info/*.* -%{prefix}/share/omf/* -%{prefix}/share/pixmaps/* -/usr/share/mime/packages/*.xml -%{prefix}/%{_lib}/bonobo/servers/GNOME_Mergeant.server +%{_bindir}/* +%{_datadir}/applications/*.desktop +%{_datadir}/mime/packages/*.xml +%{_datadir}/omf/* +%{_datadir}/pixmaps/* +%{_libdir}/bonobo/servers/GNOME_Mergeant.server %changelog -n mergeant +* Thu Jan 04 2007 - sbrabec@suse.cz +- Prefix changed to /usr. +- Spec file cleanup. * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Mon Aug 08 2005 - rodrigo@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