Hello community,
here is the log from the commit of package gedit
checked in at Wed Jan 10 19:03:45 CET 2007.
--------
--- GNOME/gedit/gedit.changes 2006-11-14 21:34:40.000000000 +0100
+++ /mounts/work_src_done/STABLE/gedit/gedit.changes 2007-01-03 17:32:06.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Jan 3 17:31:26 CET 2007 - sbrabec@suse.cz
+
+- Prefix changed to /usr.
+- Spec file cleanup.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gedit.spec ++++++
--- /var/tmp/diff_new_pack.h15514/_old 2007-01-10 19:03:29.000000000 +0100
+++ /var/tmp/diff_new_pack.h15514/_new 2007-01-10 19:03:29.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gedit (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,26 +11,25 @@
# norootforbuild
Name: gedit
-BuildRequires: aspell-devel docbook_4 gettext gnome-common gnome-doc-utils-devel gnome-patch-translation gnome-python-desktop gnutls-devel gtksourceview-devel indent intltool kdelibs3-doc libglade2-devel libgnomeprintui-devel libidl-devel mDNSResponder-devel perl-XML-Parser python-devel python-gobject2-devel python-gtk-devel scrollkeeper update-desktop-files
-%define prefix /opt/gnome
-%define sysconfdir /etc%{prefix}
+BuildRequires: aspell-devel docbook_4 gettext gnome-common gnome-doc-utils-devel gnome-icon-theme gnome-patch-translation gnome-python-desktop gnutls-devel gtksourceview-devel indent intltool kdelibs3-doc libglade2-devel libgnomeprintui-devel libidl-devel mDNSResponder-devel perl-XML-Parser python-devel python-gobject2-devel python-gtk-devel scrollkeeper update-desktop-files
License: GNU General Public License (GPL)
Group: Productivity/Editors/Other
-Autoreqprov: on
Version: 2.16.1
-Release: 21
+Release: 38
Summary: The Editor for the GNOME 2.x Desktop
Source: ftp://ftp.gnome.org/pub/gnome/sources/gedit/2.10/%{name}-%{version}.tar.bz2
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Docdir: %{_defaultdocdir}/gedit
-PreReq: filesystem /usr/bin/touch gconf2
Provides: gedit2
Obsoletes: gedit2
Patch1: gedit-default-plugins.patch
Patch2: gedit-desktop.patch
Patch4: gedit-autodetect-utf-16.patch
-Requires: python-gtk python-gobject2 python-gnome gnome-python-desktop python-xml
+Requires: python-gtk python-gobject2 python-gnome gnome-icon-theme gnome-python-desktop python-xml
+Provides: %{name}-devel = %{version}-%{release}
+Autoreqprov: on
+
+%gconf_schemas_prereq
%description
Gedit is a small, fast, and reliable editor for the GNOME 2.x Desktop.
@@ -45,7 +44,6 @@
%package devel
Summary: The Editor for the GNOME 2.x Desktop
Group: Productivity/Editors/Other
-Autoreqprov: on
Provides: gedit2-devel
Obsoletes: gedit2-devel
Requires: libgnomeui-devel libglade2-devel libgnomeprintui-devel gtksourceview-devel
@@ -60,6 +58,21 @@
Chema Celorio
Paolo Maggi
+%package doc
+Summary: The Editor for the GNOME 2.x Desktop
+Group: Productivity/Editors/Other
+Requires: libgnomeui-devel libglade2-devel libgnomeprintui-devel gtksourceview-devel
+
+%description doc
+Gedit is a small, fast, and reliable editor for the GNOME 2.x Desktop.
+
+
+
+Authors:
+--------
+ Chema Celorio
+ Paolo Maggi
+
%prep
%setup -q
gnome-patch-translation-prepare
@@ -69,76 +82,60 @@
gnome-patch-translation-update
%build
-autoreconf --install --force
-CFLAGS="$RPM_OPT_FLAGS" \
-CXXFLAGS="$RPM_OPT_FLAGS" \
- ./configure \
- --prefix=%prefix \
- --libdir=%prefix/%_lib \
- --sysconfdir=%sysconfdir \
- --mandir=%prefix/share/man \
- --localstatedir=/var/%_lib \
+autoreconf -f -i
+# FIXME: Build as root modifies system!
+# gedit-2.16.1: --disable-scrollkeeper does not work properly.
+%configure\
--disable-scrollkeeper
-export LIBRARY_PATH=/opt/gnome/%_lib
-make
+make %{?jobs:-j%jobs}
%install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
-#remove the stuff we don't want
-rm -rf $RPM_BUILD_ROOT/var/%_lib/scrollkeeper
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-# cleanup buildroot
-rm -f $RPM_BUILD_ROOT/%{prefix}/%_lib/gedit-2/plugins/*.la
-gzip -9nf $RPM_BUILD_ROOT%{prefix}/share/man/man?/*.?
-%find_lang gedit
+mkdir $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+ln -s ../icons/gnome/scalable/apps/text-editor.svg $RPM_BUILD_ROOT%{_datadir}/pixmaps/
%suse_update_desktop_file -N gedit -G "Text Editor" gedit TextEditor
-for xml in $RPM_BUILD_ROOT%{prefix}/share/gnome/help/gedit/*/gedit.xml; do
+for xml in $RPM_BUILD_ROOT%{_datadir}/gnome/help/gedit/*/gedit.xml; do
meinproc --check --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || :
done
-
-%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/gedit.schemas >/dev/null
-touch var/adm/SuSEconfig/run-scrollkeeper-update
-
-%postun
-touch var/adm/SuSEconfig/run-scrollkeeper-update
+%find_lang %{name}
+%find_gconf_schemas
+cat %{name}.lang %{name}.schemas_list >%{name}.lst
+rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f gedit.lang
+%pre -f %{name}.schemas_pre
+
+%posttrans -f %{name}.schemas_posttrans
+
+%preun -f %{name}.schemas_preun
+
+%files -f %{name}.lst
+%defattr(-, root, root)
+%doc AUTHORS BUGS ChangeLog COPYING MAINTAINERS NEWS README TODO
+%{_bindir}/gedit
+%{_bindir}/gnome-text-editor
+%{_datadir}/applications/*.desktop
+%{_datadir}/gedit-2
+%{_datadir}/omf/gedit
+%{_datadir}/pixmaps/*.svg
+%{_libdir}/gedit-2
+%doc %{_mandir}/man1/gedit*
+
+%files devel
+%defattr(-, root, root)
+%{_includedir}/*
+%{_libdir}/pkgconfig/*.pc
+
+%files doc
%defattr(-, root, root)
-%{sysconfdir}/gconf/schemas/gedit.schemas
-%{sysconfdir}/gconf/schemas/gedit-file-browser.schemas
-%{prefix}/share/applications/*.desktop
-#%{prefix}/share/application-registry/gedit.applications
-%{prefix}/share/gnome/help/gedit/*/*.bz2
-%{prefix}/share/omf/gedit
-%{prefix}/share/gedit-2
-#%{prefix}/share/mime-info/*
-#%{prefix}/share/idl/*
-%dir %{prefix}/share/gtk-doc/html/gedit
-%{prefix}/share/gtk-doc/html/gedit/*
-%dir %{prefix}/%_lib/gedit-2
-%dir %{prefix}/%_lib/gedit-2/plugins
-%{prefix}/%_lib/gedit-2/plugins/*
-#%{prefix}/share/pixmaps/*.png
-%{prefix}/bin/gedit
-%{prefix}/bin/gnome-text-editor
-%doc %{prefix}/share/man/man1/gedit*
-#%{prefix}/%_lib/bonobo/servers/*.server
-%{prefix}/%_lib/pkgconfig/*.pc
-%{prefix}/include/*
-%dir %{prefix}/%_lib/gedit-2/plugins/externaltools
-%{prefix}/%_lib/gedit-2/plugins/externaltools/*
-%dir %{prefix}/%_lib/gedit-2/plugins/pythonconsole
-%{prefix}/%_lib/gedit-2/plugins/pythonconsole/*
-%dir %{prefix}/%_lib/gedit-2/plugins/snippets
-%{prefix}/%_lib/gedit-2/plugins/snippets/*
+%{_datadir}/gtk-doc/html/gedit
%changelog -n gedit
+* Wed Jan 03 2007 - sbrabec@suse.cz
+- Prefix changed to /usr.
+- Spec file cleanup.
* Tue Nov 14 2006 - jhargadon@suse.de
- made changes to the BuildRequires and Requires to enable python
plugins. defect #220820
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org