Hello community,
here is the log from the commit of package libgsf
checked in at Tue Jan 9 17:51:00 CET 2007.
--------
--- libgsf/libgsf.changes 2006-12-14 16:38:04.000000000 +0100
+++ /mounts/work_src_done/STABLE/libgsf/libgsf.changes 2006-12-14 16:56:07.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Dec 14 16:55:29 CET 2006 - sbrabec@suse.cz
+
+- Prefix changed to /usr.
+- Spec file cleanup.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libgsf.spec ++++++
--- /var/tmp/diff_new_pack.r13133/_old 2007-01-09 17:50:56.000000000 +0100
+++ /var/tmp/diff_new_pack.r13133/_new 2007-01-09 17:50:56.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libgsf (Version 1.14.2)
#
-# 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,9 +11,7 @@
# norootforbuild
Name: libgsf
-BuildRequires: gconf2-devel glib2-devel gnome-common gtkdoc intltool libgnome-devel libxml2-devel perl-XML-Parser python-devel update-desktop-files
-%define prefix /opt/gnome
-%define sysconfdir /etc/%{prefix}
+BuildRequires: gconf2-devel glib2-devel gnome-common gtk-doc intltool libgnome-devel libxml2-devel perl-XML-Parser python-devel update-desktop-files
License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: Development/Libraries/GNOME
# Provide support for old soname
@@ -31,14 +29,15 @@
Provides: libgsf-1.so.113
%endif
%endif
-Autoreqprov: on
Version: 1.14.2
-Release: 26
+Release: 34
Summary: GNOME Structured File Library
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source: libgsf-%{version}.tar.bz2
-PreReq: filesystem
+Source: %{name}-%{version}.tar.bz2
+Autoreqprov: on
+
+%gconf_schemas_prereq
%description
A library for reading and writing structured files (MS OLE and Zip, for
@@ -65,28 +64,9 @@
--------
Jody Goldberg
-%package doc
-Summary: Additional Package Documentation.
-Group: Development/Libraries/GNOME
-
-%description doc
-This package contains optional documentation provided in addition to
-this package's base documentation.
-
-
-
-Authors:
---------
- Jody Goldberg
-
-
-%files doc
-%defattr(-, root, root)
-%{prefix}/share/gtk-doc/html/*
%package gnome
Summary: GNOME Structured File Library
Group: Development/Libraries/GNOME
-Provides: libgsf:%{prefix}/%_lib/libgsf-gnome-1.so.1
# Provide support for old soname
%if %suse_version <= 1000
%ifarch ia64 x86_64 ppc64 s390x
@@ -103,7 +83,23 @@
%endif
%endif
Requires: %{name} = %{version}
-PreReq: filesystem gconf2
+
+%gconf_schemas_prereq
+%package doc
+Summary: Additional Package Documentation.
+Group: Development/Libraries/GNOME
+Requires: %{name} = %{version}
+
+%description doc
+This package contains optional documentation provided in addition to
+this package's base documentation.
+
+
+
+Authors:
+--------
+ Jody Goldberg
+
%description gnome
A library for reading and writing structured files (MS OLE and Zip, for
@@ -119,38 +115,26 @@
%setup -q
%build
-glib-gettextize --force --copy
-intltoolize --force --copy
-aclocal -I m4
-autoconf
-autoheader
-automake
-CFLAGS="$RPM_OPT_FLAGS" \
- ./configure --prefix=%prefix \
- --libexecdir=%prefix/%_lib/libgnome-2 \
- --libdir=%prefix/%_lib \
- --mandir=%{_mandir} \
- --sysconfdir=%{sysconfdir}
-make
+autoreconf -f -i
+%configure
+make %{?jobs:-j%jobs}
%install
-test -z "$RPM_BUILD_ROOT" || rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make -i install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-%find_lang %{name}
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/*.*
+make install DESTDIR=$RPM_BUILD_ROOT
# Provide support for old soname
%if %suse_version <= 1000
-mkdir -p $RPM_BUILD_ROOT/usr/%_lib
-ln -s /opt/gnome/%_lib/libgsf-1.so.114 $RPM_BUILD_ROOT/usr/%_lib/libgsf-1.so.1
-ln -s /opt/gnome/%_lib/libgsf-gnome-1.so.114 $RPM_BUILD_ROOT/usr/%_lib/libgsf-gnome-1.so.1
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+ln -s libgsf-1.so.114 $RPM_BUILD_ROOT%{_libdir}/libgsf-1.so.1
+ln -s libgsf-gnome-1.so.114 $RPM_BUILD_ROOT%{_libdir}/libgsf-gnome-1.so.1
%endif
%if %suse_version == 1010
-mkdir -p $RPM_BUILD_ROOT/usr/%_lib
-ln -s /opt/gnome/%_lib/libgsf-1.so.114 $RPM_BUILD_ROOT/usr/%_lib/libgsf-1.so.113
-ln -s /opt/gnome/%_lib/libgsf-gnome-1.so.114 $RPM_BUILD_ROOT/usr/%_lib/libgsf-gnome-1.so.113
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+ln -s libgsf-1.so.114 $RPM_BUILD_ROOT%{_libdir}/libgsf-1.so.113
+ln -s libgsf-gnome-1.so.114 $RPM_BUILD_ROOT%{_libdir}/libgsf-gnome-1.so.113
%endif
+%find_lang %{name}
+# gconf_schemas go to -gnome subpackage:
+%find_gconf_schemas
%clean
rm -rf $RPM_BUILD_ROOT
@@ -161,51 +145,49 @@
%postun
%run_ldconfig
+%pre gnome -f %{name}.schemas_pre
+
%post gnome
%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/gsf-office-thumbnailer.schemas >/dev/null
+
+%posttrans gnome -f %{name}.schemas_posttrans
+
+%preun gnome -f %{name}.schemas_preun
%postun gnome
%run_ldconfig
-%files -f %files -f %{name}.lang
+%files -f %{name}.lang
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README
-%{prefix}/%_lib/libgsf-1.so.*
-%if %suse_version <= 1000
-/usr/%_lib/libgsf-1.so.1
-%endif
-%if %suse_version == 1010
-/usr/%_lib/libgsf-1.so.113
-%endif
-%{prefix}/bin/gsf-vba-dump
+%{_bindir}/gsf
# NOTE: gsf-office-thumbnailer does not require GNOME, place it here.
# Registration of thumbnailer to GNOME requires it, place it to libgsf-gnome.
-%{prefix}/bin/gsf-office-thumbnailer
-%{prefix}/bin/gsf
+%{_bindir}/gsf-office-thumbnailer
+%{_bindir}/gsf-vba-dump
+%{_libdir}/libgsf-1.so.*
%doc %{_mandir}/man1/*.*
%files devel
%defattr(-, root, root)
-%{prefix}/%_lib/pkgconfig/libgsf*.pc
-%{prefix}/%_lib/*.*a
-%{prefix}/%_lib/*.so
-%{prefix}/include/libgsf-1
+%{_libdir}/*.so
+%{_libdir}/*.*a
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/libgsf-1
-%files gnome
+%files gnome -f %{name}.schemas_list
%defattr(-, root, root)
-%{sysconfdir}/gconf/schemas/gsf-office-thumbnailer.schemas
-%{prefix}/%_lib/libgsf-gnome-1.so.*
-%if %suse_version <= 1000
-/usr/%_lib/libgsf-gnome-1.so.1
-%endif
-%if %suse_version == 1010
-/usr/%_lib/libgsf-gnome-1.so.113
-%endif
+%{_libdir}/libgsf-gnome-1.so.*
+
+%files doc
+%defattr(-, root, root)
+%{_datadir}/gtk-doc/html/*
%changelog -n libgsf
* Thu Dec 14 2006 - sbrabec@suse.cz
+- Prefix changed to /usr.
+- Spec file cleanup.
+* Thu Dec 14 2006 - sbrabec@suse.cz
- Fixed old soname support for released products.
* Sun Oct 15 2006 - danw@suse.de
- Remove upstreamed patches
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org