This commit is contained in:
parent
144508939d
commit
564e699b0e
@ -1,2 +1,8 @@
|
||||
glib2
|
||||
libglib-2_0-0
|
||||
libgmodule-2_0-0
|
||||
libgio-2_0-0
|
||||
libgthread-2_0-0
|
||||
libgobject-2_0-0
|
||||
|
||||
arch ppc64 package glib2-devel
|
||||
|
@ -1,3 +1,39 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 4 16:18:40 CEST 2008 - maw@suse.de
|
||||
|
||||
- Merge the BETA and STABLE branches
|
||||
- Remove, pending further discussion, libgio-2_0-0's
|
||||
recommendation of gvfs.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 1 19:16:57 CEST 2008 - maw@suse.de
|
||||
|
||||
- Split out several shared library subpackages:
|
||||
+ The new packages are:
|
||||
* libglib-2_0-0, which provides implementations of common data
|
||||
structures and algorithms
|
||||
* libgmodule-2_0-0, which provides portable loadable module
|
||||
functionality
|
||||
* libgthread-2_0-0, which provides portable threading
|
||||
functionality similar to that of pthreads
|
||||
* libgio-2_0-0, which provides abstracted IO operations
|
||||
* libgobject-2_0-0, which provides object oriented facilities
|
||||
available from C
|
||||
+ Impact on consuming packages:
|
||||
* Consuming packages can continue to require glib2-devel to
|
||||
build
|
||||
* Packages that use AutoReqProv to pick up glib2 requirements
|
||||
should require no change
|
||||
* Packages that eschew AutoReqProv in favour of explicitly
|
||||
depending on glib2 will need to have their dependencies
|
||||
adjusted to explicitly depend upon the correct subpackage
|
||||
+ The glib2 base package remains as a skeleton; the subpackages
|
||||
continue to depend upon it
|
||||
+ The net effect of this change should be a reduction in the
|
||||
space required for applications which only consume a small part
|
||||
of glib2's functionality; packages which require more of it
|
||||
should see no change.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 1 18:40:52 CEST 2008 - coolo@suse.de
|
||||
|
||||
|
238
glib2.spec
238
glib2.spec
@ -18,7 +18,7 @@ License: LGPL v2.1 or later
|
||||
Group: Development/Libraries/C and C++
|
||||
AutoReqProv: on
|
||||
Version: 2.16.1
|
||||
Release: 8
|
||||
Release: 9
|
||||
Summary: A Library with Convenient Functions Written in C
|
||||
Url: http://www.gtk.org/
|
||||
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.14/%{_name}-%{version}.tar.bz2
|
||||
@ -45,7 +45,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires: %{name}-lang = %{version}
|
||||
# For temporary %%pre script only.
|
||||
PreReq: coreutils
|
||||
# Conflicts of gnome_defaults.conf from gnome-vfs2 in == 10.3
|
||||
PreReq: /bin/sed
|
||||
# Conflicts with gnome_defaults.conf from gnome-vfs2 in 10.3
|
||||
Conflicts: gnome-vfs2 < 2.22.0
|
||||
|
||||
%description
|
||||
@ -74,6 +75,12 @@ Authors:
|
||||
%package devel
|
||||
License: GPL v2 or later
|
||||
Requires: %{name} = %{version} pcre-devel pkg-config glibc-devel
|
||||
# Now require the subpackages too
|
||||
Requires: libglib-2_0-0
|
||||
Requires: libgmodule-2_0-0
|
||||
Requires: libgio-2_0-0
|
||||
Requires: libgthread-2_0-0
|
||||
Requires: libgobject-2_0-0
|
||||
Summary: Include files and libraries mandatory for development
|
||||
Group: Development/Libraries/C and C++
|
||||
AutoReqProv: on
|
||||
@ -88,6 +95,153 @@ hashes, to a C programmer and is used by Gtk+ and GNOME.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Peter Mattis <petm@xcf.berkeley.edu>
|
||||
Spencer Kimball <spencer@xcf.berkeley.edu>
|
||||
Josh MacDonald <jmacd@xcf.berkeley.edu>
|
||||
Shawn T. Amundson <amundson@gimp.org>
|
||||
Jeff Garzik <jgarzik@pobox.com>
|
||||
Raja R Harinath <harinath@cs.umn.edu>
|
||||
Tim Janik <timj@gtk.org>
|
||||
Elliot Lee <sopwith@redhat.com>
|
||||
Tor Lillqvist <tml@iki.fi>
|
||||
Paolo Molaro <lupus@debian.org>
|
||||
Havoc Pennington <hp@pobox.com>
|
||||
Manish Singh <yosh@gimp.org>
|
||||
Owen Taylor <otaylor@gtk.org>
|
||||
Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
%package -n libglib-2_0-0
|
||||
License: LGPL v2.1 or later
|
||||
Summary: A Library with Convenient Functions Written in C
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%description -n libglib-2_0-0
|
||||
This library provides convenient functions, such as lists and hashes,
|
||||
to a C programmer and is used by Gtk+ and GNOME.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Peter Mattis <petm@xcf.berkeley.edu>
|
||||
Spencer Kimball <spencer@xcf.berkeley.edu>
|
||||
Josh MacDonald <jmacd@xcf.berkeley.edu>
|
||||
Shawn T. Amundson <amundson@gimp.org>
|
||||
Jeff Garzik <jgarzik@pobox.com>
|
||||
Raja R Harinath <harinath@cs.umn.edu>
|
||||
Tim Janik <timj@gtk.org>
|
||||
Elliot Lee <sopwith@redhat.com>
|
||||
Tor Lillqvist <tml@iki.fi>
|
||||
Paolo Molaro <lupus@debian.org>
|
||||
Havoc Pennington <hp@pobox.com>
|
||||
Manish Singh <yosh@gimp.org>
|
||||
Owen Taylor <otaylor@gtk.org>
|
||||
Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
%package -n libgmodule-2_0-0
|
||||
License: LGPL v2.1 or later
|
||||
Summary: A Library with Convenient Functions Written in C
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%description -n libgmodule-2_0-0
|
||||
This library provides convenient functions, such as lists and hashes,
|
||||
to a C programmer and is used by Gtk+ and GNOME.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Peter Mattis <petm@xcf.berkeley.edu>
|
||||
Spencer Kimball <spencer@xcf.berkeley.edu>
|
||||
Josh MacDonald <jmacd@xcf.berkeley.edu>
|
||||
Shawn T. Amundson <amundson@gimp.org>
|
||||
Jeff Garzik <jgarzik@pobox.com>
|
||||
Raja R Harinath <harinath@cs.umn.edu>
|
||||
Tim Janik <timj@gtk.org>
|
||||
Elliot Lee <sopwith@redhat.com>
|
||||
Tor Lillqvist <tml@iki.fi>
|
||||
Paolo Molaro <lupus@debian.org>
|
||||
Havoc Pennington <hp@pobox.com>
|
||||
Manish Singh <yosh@gimp.org>
|
||||
Owen Taylor <otaylor@gtk.org>
|
||||
Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
%package -n libgio-2_0-0
|
||||
License: LGPL v2.1 or later
|
||||
Summary: A Library with Convenient Functions Written in C
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name} = %{version}
|
||||
# Temporarily disable this, pending further discussion
|
||||
# Recommends: gvfs
|
||||
|
||||
%description -n libgio-2_0-0
|
||||
This library provides convenient functions, such as lists and hashes,
|
||||
to a C programmer and is used by Gtk+ and GNOME.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Peter Mattis <petm@xcf.berkeley.edu>
|
||||
Spencer Kimball <spencer@xcf.berkeley.edu>
|
||||
Josh MacDonald <jmacd@xcf.berkeley.edu>
|
||||
Shawn T. Amundson <amundson@gimp.org>
|
||||
Jeff Garzik <jgarzik@pobox.com>
|
||||
Raja R Harinath <harinath@cs.umn.edu>
|
||||
Tim Janik <timj@gtk.org>
|
||||
Elliot Lee <sopwith@redhat.com>
|
||||
Tor Lillqvist <tml@iki.fi>
|
||||
Paolo Molaro <lupus@debian.org>
|
||||
Havoc Pennington <hp@pobox.com>
|
||||
Manish Singh <yosh@gimp.org>
|
||||
Owen Taylor <otaylor@gtk.org>
|
||||
Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
%package -n libgthread-2_0-0
|
||||
License: LGPL v2.1 or later
|
||||
Summary: A Library with Convenient Functions Written in C
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%description -n libgthread-2_0-0
|
||||
This library provides convenient functions, such as lists and hashes,
|
||||
to a C programmer and is used by Gtk+ and GNOME.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Peter Mattis <petm@xcf.berkeley.edu>
|
||||
Spencer Kimball <spencer@xcf.berkeley.edu>
|
||||
Josh MacDonald <jmacd@xcf.berkeley.edu>
|
||||
Shawn T. Amundson <amundson@gimp.org>
|
||||
Jeff Garzik <jgarzik@pobox.com>
|
||||
Raja R Harinath <harinath@cs.umn.edu>
|
||||
Tim Janik <timj@gtk.org>
|
||||
Elliot Lee <sopwith@redhat.com>
|
||||
Tor Lillqvist <tml@iki.fi>
|
||||
Paolo Molaro <lupus@debian.org>
|
||||
Havoc Pennington <hp@pobox.com>
|
||||
Manish Singh <yosh@gimp.org>
|
||||
Owen Taylor <otaylor@gtk.org>
|
||||
Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
%package -n libgobject-2_0-0
|
||||
License: LGPL v2.1 or later
|
||||
Summary: A Library with Convenient Functions Written in C
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%description -n libgobject-2_0-0
|
||||
This library provides convenient functions, such as lists and hashes,
|
||||
to a C programmer and is used by Gtk+ and GNOME.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Peter Mattis <petm@xcf.berkeley.edu>
|
||||
@ -167,11 +321,12 @@ install -D -m0644 gnome_defaults.conf $RPM_BUILD_ROOT%{_sysconfdir}/gnome_defaul
|
||||
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gio-2.0 $RPM_BUILD_ROOT%{_datadir}/applications
|
||||
touch $RPM_BUILD_ROOT%{_localstatedir}/cache/gio-2.0/defaults.list
|
||||
ln -s %{_localstatedir}/cache/gio-2.0/defaults.list $RPM_BUILD_ROOT%{_datadir}/applications/defaults.list
|
||||
#chmod +x $RPM_BUILD_ROOT/%{_bindir}/gtester-report
|
||||
chmod +x $RPM_BUILD_ROOT/%{_bindir}/gtester-report
|
||||
### cp -a %{S:1} $RPM_BUILD_ROOT/etc/profile.d/zzz-glib2.sh
|
||||
### cp -a %{S:2} $RPM_BUILD_ROOT/etc/profile.d/zzz-glib2.csh
|
||||
### chmod +x $RPM_BUILD_ROOT/%{_bindir}/gtester-report
|
||||
%find_lang %{_name}20
|
||||
%fdupes $RPM_BUILD_ROOT
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%posttrans
|
||||
# If it is an upgrade and gnome_defaults.conf were edited,
|
||||
# move it from its old location. (Upgrade from <= 10.2)
|
||||
@ -186,7 +341,25 @@ if test -f etc/gnome_defaults.conf.rpmsave ; then
|
||||
mv etc/gnome_defaults.conf.rpmsave etc/gnome_defaults.conf
|
||||
fi
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
%post -n libglib-2_0-0 -p /sbin/ldconfig
|
||||
|
||||
%post -n libgobject-2_0-0 -p /sbin/ldconfig
|
||||
|
||||
%post -n libgthread-2_0-0 -p /sbin/ldconfig
|
||||
|
||||
%post -n libgio-2_0-0 -p /sbin/ldconfig
|
||||
|
||||
%post -n libgmodule-2_0-0 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libglib-2_0-0 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libgobject-2_0-0 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libgthread-2_0-0 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libgio-2_0-0 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libgmodule-2_0-0 -p /sbin/ldconfig
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
@ -195,12 +368,31 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%defattr(-,root,root)
|
||||
%doc AUTHORS COPYING README NEWS ChangeLog
|
||||
%{_datadir}/applications/defaults.list
|
||||
%{_libdir}/lib*.so.*
|
||||
/etc/profile.d/zzz-glib2.*
|
||||
/sbin/conf.d/SuSEconfig.glib2
|
||||
%config (noreplace) %{_sysconfdir}/gnome_defaults.conf
|
||||
|
||||
%files -n libglib-2_0-0
|
||||
%defattr(-, root, root)
|
||||
%{_libdir}/libglib*.so.*
|
||||
|
||||
%files -n libgmodule-2_0-0
|
||||
%defattr(-, root, root)
|
||||
%{_libdir}/libgmodule*.so.*
|
||||
|
||||
%files -n libgobject-2_0-0
|
||||
%defattr(-, root, root)
|
||||
%{_libdir}/libgobject*.so.*
|
||||
|
||||
%files -n libgthread-2_0-0
|
||||
%defattr(-, root, root)
|
||||
%{_libdir}/libgthread*.so.*
|
||||
|
||||
%files -n libgio-2_0-0
|
||||
%defattr(-, root, root)
|
||||
%{_libdir}/libgio*.so.*
|
||||
%dir %{_localstatedir}/cache/gio-2.0
|
||||
%ghost %{_localstatedir}/cache/gio-2.0/defaults.list
|
||||
%config (noreplace) %{_sysconfdir}/gnome_defaults.conf
|
||||
|
||||
%files lang -f %{_name}20.lang
|
||||
|
||||
@ -227,6 +419,36 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%dir %{_datadir}/gtk-doc/html
|
||||
|
||||
%changelog
|
||||
* Fri Apr 04 2008 maw@suse.de
|
||||
- Merge the BETA and STABLE branches
|
||||
- Remove, pending further discussion, libgio-2_0-0's
|
||||
recommendation of gvfs.
|
||||
* Tue Apr 01 2008 maw@suse.de
|
||||
- Split out several shared library subpackages:
|
||||
+ The new packages are:
|
||||
* libglib-2_0-0, which provides implementations of common data
|
||||
structures and algorithms
|
||||
* libgmodule-2_0-0, which provides portable loadable module
|
||||
functionality
|
||||
* libgthread-2_0-0, which provides portable threading
|
||||
functionality similar to that of pthreads
|
||||
* libgio-2_0-0, which provides abstracted IO operations
|
||||
* libgobject-2_0-0, which provides object oriented facilities
|
||||
available from C
|
||||
+ Impact on consuming packages:
|
||||
* Consuming packages can continue to require glib2-devel to
|
||||
build
|
||||
* Packages that use AutoReqProv to pick up glib2 requirements
|
||||
should require no change
|
||||
* Packages that eschew AutoReqProv in favour of explicitly
|
||||
depending on glib2 will need to have their dependencies
|
||||
adjusted to explicitly depend upon the correct subpackage
|
||||
+ The glib2 base package remains as a skeleton; the subpackages
|
||||
continue to depend upon it
|
||||
+ The net effect of this change should be a reduction in the
|
||||
space required for applications which only consume a small part
|
||||
of glib2's functionality; packages which require more of it
|
||||
should see no change.
|
||||
* Tue Apr 01 2008 coolo@suse.de
|
||||
- moved recommendation of gvfs to gtk2
|
||||
* Tue Apr 01 2008 sbrabec@suse.cz
|
||||
|
Loading…
Reference in New Issue
Block a user