Hello community,
here is the log from the commit of package conglomerate
checked in at Wed Jan 10 18:06:00 CET 2007.
--------
--- GNOME/conglomerate/conglomerate.changes 2006-08-02 20:00:40.000000000 +0200
+++ /mounts/work_src_done/STABLE/conglomerate/conglomerate.changes 2007-01-04 11:55:42.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Jan 4 11:55:29 CET 2007 - sbrabec@suse.cz
+
+- Prefix changed to /usr.
+- Spec file cleanup.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ conglomerate.spec ++++++
--- /var/tmp/diff_new_pack.K32141/_old 2007-01-10 18:05:40.000000000 +0100
+++ /var/tmp/diff_new_pack.K32141/_new 2007-01-10 18:05:40.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package conglomerate (Version 0.9.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,21 +11,20 @@
# norootforbuild
Name: conglomerate
-BuildRequires: enchant-devel gnutls-devel gtkdoc gtksourceview-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel libxslt-devel mDNSResponder-devel perl-XML-Parser scrollkeeper sgml-skel update-desktop-files
-%define prefix /opt/gnome
-%define sysconfdir /etc%{prefix}
+BuildRequires: enchant-devel gnutls-devel gtk-doc gtksourceview-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel libxslt-devel mDNSResponder-devel perl-XML-Parser scrollkeeper sgml-skel shared-mime-info update-desktop-files
Summary: XML Editor for GNOME
Version: 0.9.1
-Release: 19
+Release: 57
Group: Productivity/Publishing/XML
-AutoReqProv: on
-License: GPL
+License: GNU General Public License (GPL)
URL: http://www.conglomerate.org/
Source0: %{name}-%{version}.tar.bz2
Patch: conglomerate-desktop.patch
Patch2: conglomerate-readme-xds.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-PreReq: filesystem gconf2 /usr/bin/touch shared-mime-info
+AutoReqProv: on
+
+%gconf_schemas_prereq
%description
Conglomerate is a user-friendly XML editor for DocBook and other
@@ -38,85 +37,70 @@
--------
David Malcolm
-%define INSTALL install -m755 -s
-%define INSTALL_SCRIPT install -m755
-%define INSTALL_DIR install -d -m755
-%define INSTALL_DATA install -m644
%prep
%setup -q
%patch -p 1
%patch2
+rename no nb po/no.*
+sed -i "/^ALL_LINGUAS/s/ no / nb /" configure.in
%build
# - Add enchant and enchant-devel to neededforbuild.
# for the moment do not enable: enchant enchant-devel
-intltoolize --copy --force
-autoreconf -I /opt/gnome/share/aclocal --install --force
-CFLAGS="$RPM_OPT_FLAGS -L%_libdir -g" \
- ./configure \
- --prefix=%prefix \
- --libdir=%prefix/%_lib \
- --sysconfdir=%sysconfdir \
- --datadir=%prefix/share \
- --localstatedir=/var/%_lib \
- --enable-printing \
- --disable-schemas-install \
- --with-kde-datadir=/opt/kde
-export LIBRARY_PATH=/opt/gnome/%_lib
-make
+# needed for conglomerate-0.9.1:
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+autoreconf -f -i
+# FIXME: GTKDOC_CFLAGS:
+# Silently ignored compilation of uninstalled gtk-doc scanners without RPM_OPT_FLAGS.
+%configure\
+ --disable-scrollkeeper\
+ --disable-schemas-install\
+ --enable-printing
+make %{?jobs:-j%jobs}
%install
-if [ ! "x" = "x$RPM_BUILD_ROOT" ] ; then
- rm -fr $RPM_BUILD_ROOT
- %{INSTALL_DIR} $RPM_BUILD_ROOT
-fi
-# FIXME dummy:
-# echo '<br>' >doc/reference/html/index.sgml
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-#
-rm -f $RPM_BUILD_ROOT%{prefix}/share/pixmaps/ChangeLog
DESTDIR=$RPM_BUILD_ROOT mime-info-to-mime
-[ -d $RPM_BUILD_ROOT%{prefix}/share/locale/no ] && {
- install -d $RPM_BUILD_ROOT%{prefix}/share/locale/nb/LC_MESSAGES
- cp $RPM_BUILD_ROOT%{prefix}/share/locale/no/LC_MESSAGES/*.mo \
- $RPM_BUILD_ROOT%{prefix}/share/locale/nb/LC_MESSAGES
- rm -fr $RPM_BUILD_ROOT%{prefix}/share/locale/no
-}
%suse_update_desktop_file %name Utility TextEditor
+%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%{_datadir}/application-registry
-%postun
-touch var/adm/SuSEconfig/run-scrollkeeper-update
-usr/bin/update-mime-database /usr/share/mime >/dev/null
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%pre -f %{name}.schemas_pre
%post
-touch var/adm/SuSEconfig/run-scrollkeeper-update
-usr/bin/update-mime-database /usr/share/mime >/dev/null
-#
-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/%{name}.schemas >/dev/null
+if test -x usr/bin/update-mime-database ; then
+ usr/bin/update-mime-database usr/share/mime >/dev/null
+fi
-%clean
-rm -fr $RPM_BUILD_ROOT
+%posttrans -f %{name}.schemas_posttrans
+
+%postun
+if test -x usr/bin/update-mime-database ; then
+ usr/bin/update-mime-database usr/share/mime >/dev/null
+fi
+
+%preun -f %{name}.schemas_preun
-%files
+%files -f %{name}.lst
%defattr(-, root, root)
+%{_bindir}/*
+%{_datadir}/applications/*.desktop
+%{_datadir}/%{name}
+%{_datadir}/pixmaps/*
+%{_datadir}/omf/conglomerate
+%{_datadir}/mime/packages/*.xml
# %doc
-%{prefix}/bin/*
-%{prefix}/share/applications/*.desktop
-%{prefix}/share/%{name}
-%{prefix}/share/locale/*/LC_MESSAGES/*.mo
-%{prefix}/share/pixmaps/*
-%{prefix}/share/gtk-doc/html/conglomerate
-%{prefix}/share/omf/conglomerate
-%{prefix}/share/gnome/help/conglomerate
-%{prefix}/share/application-registry/*
-%{prefix}/share/mime-info/*
-%config %sysconfdir/gconf/schemas/conglomerate.schemas
-/usr/share/mime/packages/*.xml
+%{_datadir}/gtk-doc/html/conglomerate
%changelog -n conglomerate
+* Thu Jan 04 2007 - sbrabec@suse.cz
+- Prefix changed to /usr.
+- Spec file cleanup.
* Wed Aug 02 2006 - danw@suse.de
- intltoolize before autoreconf'ing to avoid version skew between
configure macros and po/Makefile.in.in
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
