Accepting request 50681 from GNOME:Factory
checked in (request 50681) OBS-URL: https://build.opensuse.org/request/show/50681 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=109
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
6b2be158b8
commit
61c0b60528
@ -1,33 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 13 11:11:20 CEST 2010 - vuntz@opensuse.org
|
||||
|
||||
- Pass --with-runtime-libdir=../../%{_lib} to configure to install
|
||||
libraries (just the .so.*, not the .so) in /lib(64)? instead of
|
||||
/usr/lib(64)?.
|
||||
+ This makes sense since most and most tools used during early
|
||||
boot stage need glib libraries, and the libraries only link
|
||||
against other libraries in /lib(64)? already.
|
||||
+ It's worth mentioning that gio modules and all the GSettings
|
||||
API do require /usr, though: gio modules are installed in
|
||||
/usr/lib(64)?/gio and GSettings need
|
||||
/usr/share/glib-2.0/schemas. This shouldn't be an issue during
|
||||
early boot, since those API don't really make sense there.
|
||||
- Create a devel-static subpackage, to put the static libraries. It
|
||||
depends on the devel subpackage.
|
||||
- Remove glib2-64bit Obsoletes from libgmodule-2_0-0, libgio-2_0-0,
|
||||
libgthread-2_0-0, libgobject-2_0-0: it's already done by
|
||||
libglib-2_0-0, and all those libraries depend on libglib-2_0-0.
|
||||
- Update summaries and descriptions.
|
||||
- Change the license tag of all packages to LGPLv2+, instead of a
|
||||
mix of LGPLv2.1+ and GPLv2+ which are both wrong.
|
||||
- Change groups of most subpackages to System/Libraries, instead of
|
||||
Development/Libraries/C and C++.
|
||||
- Use find to remove .la files instead of manual rm.
|
||||
- Put comments that are in the scriptlets area of the spec file in
|
||||
"%if 0" statement: if we don't do that, they actually end up in
|
||||
the scriplets and can even make them fail if the scriptlets were
|
||||
just "-p /sbin/ldconfig".
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 12 00:14:59 CEST 2010 - vuntz@opensuse.org
|
||||
|
||||
|
||||
211
glib2.spec
211
glib2.spec
@ -24,10 +24,10 @@ Version: 2.27.0
|
||||
Release: 1
|
||||
# FIXME: change zlib-devel to pkgconfig(zlib) once we have a recent enough version of zlib
|
||||
# FIXME: find out if tapsets should really be in devel package or in main package
|
||||
License: LGPLv2+
|
||||
Summary: General-Purpose Utility Library
|
||||
License: LGPLv2.1+
|
||||
Summary: A Library with Convenient Functions Written in C
|
||||
Url: http://www.gtk.org/
|
||||
Group: System/Libraries
|
||||
Group: Development/Libraries/C and C++
|
||||
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.14/%{_name}-%{version}.tar.bz2
|
||||
Source1: glib2.sh
|
||||
Source2: glib2.csh
|
||||
@ -66,24 +66,22 @@ PreReq: /bin/sed
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
GLib is a general-purpose utility library, which provides many useful
|
||||
data types, macros, type conversions, string utilities, file utilities,
|
||||
a main loop abstraction, and so on.
|
||||
This library provides convenient functions, such as lists and hashes,
|
||||
to a C programmer and is used by Gtk+ and GNOME.
|
||||
|
||||
%package tools
|
||||
License: LGPLv2+
|
||||
Summary: General-Purpose Utility Library -- Tools
|
||||
License: LGPLv2.1+
|
||||
Summary: A Library with Convenient Functions Written in C -- Tools
|
||||
Group: Development/Libraries/C and C++
|
||||
|
||||
%description tools
|
||||
GLib is a general-purpose utility library, which provides many useful
|
||||
data types, macros, type conversions, string utilities, file utilities,
|
||||
a main loop abstraction, and so on.
|
||||
This library provides convenient functions, such as lists and hashes,
|
||||
to a C programmer and is used by Gtk+ and GNOME.
|
||||
|
||||
%package branding-upstream
|
||||
License: LGPLv2+
|
||||
License: LGPLv2.1+
|
||||
Summary: Definition of GNOME Default Applications
|
||||
Group: System/Libraries
|
||||
Group: Development/Libraries/C and C++
|
||||
Provides: %{name}-branding = %{version}
|
||||
Conflicts: otherproviders(%{name}-branding)
|
||||
Supplements: packageand(%{name}:branding-upstream)
|
||||
@ -104,7 +102,7 @@ distribution wise GNOME defaults.
|
||||
|
||||
%package devel
|
||||
#'
|
||||
License: LGPLv2+
|
||||
License: GPLv2+
|
||||
Requires: %{name} = %{version} pkg-config glibc-devel
|
||||
# Now require the subpackages too
|
||||
Requires: glib2-tools = %{version}
|
||||
@ -115,7 +113,7 @@ Requires: libgthread-2_0-0 = %{version}
|
||||
Requires: libgobject-2_0-0 = %{version}
|
||||
Provides: glib2-doc = 2.19.6
|
||||
Obsoletes: glib2-doc < 2.19.6
|
||||
Summary: General-Purpose Utility Library -- Development Files
|
||||
Summary: Include files and libraries mandatory for development
|
||||
Group: Development/Libraries/C and C++
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
@ -124,29 +122,17 @@ Obsoletes: glib2-devel-64bit
|
||||
#
|
||||
|
||||
%description devel
|
||||
GLib is a general-purpose utility library, which provides many useful
|
||||
data types, macros, type conversions, string utilities, file utilities,
|
||||
a main loop abstraction, and so on.
|
||||
This package contains all necessary include files, libraries,
|
||||
configuration files and development tools (with manual pages) needed to
|
||||
compile and link applications using the glib library.
|
||||
|
||||
This package contains the development files for GLib.
|
||||
|
||||
%package devel-static
|
||||
License: LGPLv2+
|
||||
Requires: %{name}-devel = %{version}
|
||||
Summary: General-Purpose Utility Library -- Static Libraries
|
||||
Group: Development/Libraries/C and C++
|
||||
|
||||
%description devel-static
|
||||
GLib is a general-purpose utility library, which provides many useful
|
||||
data types, macros, type conversions, string utilities, file utilities,
|
||||
a main loop abstraction, and so on.
|
||||
|
||||
This package contains static versions of the GLib libraries.
|
||||
The glib library provides convenient functions, such as lists and
|
||||
hashes, to a C programmer and is used by Gtk+ and GNOME.
|
||||
|
||||
%package -n libglib-2_0-0
|
||||
License: LGPLv2+
|
||||
Summary: General-Purpose Utility Library
|
||||
Group: System/Libraries
|
||||
License: LGPLv2.1+
|
||||
Summary: A Library with Convenient Functions Written in C
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name}-branding = %{version}
|
||||
Recommends: %{name}-lang = %{version}
|
||||
Provides: %{name} = %{version}
|
||||
@ -158,81 +144,83 @@ Obsoletes: glib2-64bit
|
||||
#
|
||||
|
||||
%description -n libglib-2_0-0
|
||||
GLib is a general-purpose utility library, which provides many useful
|
||||
data types, macros, type conversions, string utilities, file utilities,
|
||||
a main loop abstraction, and so on.
|
||||
This library provides convenient functions, such as lists and hashes,
|
||||
to a C programmer and is used by Gtk+ and GNOME.
|
||||
|
||||
%package -n libgmodule-2_0-0
|
||||
License: LGPLv2+
|
||||
Summary: General-Purpose Utility Library -- Library for Modules
|
||||
Group: System/Libraries
|
||||
License: LGPLv2.1+
|
||||
Summary: A Library with Convenient Functions Written in C
|
||||
Group: Development/Libraries/C and C++
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: glib2-64bit
|
||||
%endif
|
||||
#
|
||||
|
||||
%description -n libgmodule-2_0-0
|
||||
GLib is a general-purpose utility library, which provides many useful
|
||||
data types, macros, type conversions, string utilities, file utilities,
|
||||
a main loop abstraction, and so on.
|
||||
|
||||
The libgmodule library provides a portable way to dynamically load
|
||||
object files (commonly known as 'plug-ins').
|
||||
This library provides convenient functions, such as lists and hashes,
|
||||
to a C programmer and is used by Gtk+ and GNOME.
|
||||
|
||||
%package -n libgio-2_0-0
|
||||
License: LGPLv2+
|
||||
Summary: General-Purpose Utility Library -- Library for VFS
|
||||
Group: System/Libraries
|
||||
License: LGPLv2.1+
|
||||
Summary: A Library with Convenient Functions Written in C
|
||||
Group: Development/Libraries/C and C++
|
||||
# bnc#555605: shared-mime-info is required by libgio to properly detect mime types.
|
||||
Requires: shared-mime-info
|
||||
# The tools are useful for people having libgio
|
||||
Recommends: %{name}-tools
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: glib2-64bit
|
||||
%endif
|
||||
#
|
||||
# Temporarily disable this, pending further discussion
|
||||
# Recommends: gvfs
|
||||
|
||||
%description -n libgio-2_0-0
|
||||
GLib is a general-purpose utility library, which provides many useful
|
||||
data types, macros, type conversions, string utilities, file utilities,
|
||||
a main loop abstraction, and so on.
|
||||
|
||||
GIO provides a modern, easy-to-use VFS API.
|
||||
This library provides convenient functions, such as lists and hashes,
|
||||
to a C programmer and is used by Gtk+ and GNOME.
|
||||
|
||||
%package -n libgio-fam
|
||||
License: LGPLv2+
|
||||
Summary: General-Purpose Utility Library -- GIO Module to use FAM
|
||||
Group: System/Libraries
|
||||
License: LGPLv2.1+
|
||||
Summary: A Library with Convenient Functions Written in C
|
||||
Group: Development/Libraries/C and C++
|
||||
# we need gio-querymodules in %post/%postun
|
||||
Requires(post): %{name}-tools
|
||||
Requires(postun): %{name}-tools
|
||||
Supplements: packageand(libgio-2_0-0:fam)
|
||||
|
||||
%description -n libgio-fam
|
||||
GLib is a general-purpose utility library, which provides many useful
|
||||
data types, macros, type conversions, string utilities, file utilities,
|
||||
a main loop abstraction, and so on.
|
||||
|
||||
This packages provides a GIO module to use FAM for file monitoring.
|
||||
This library provides convenient functions, such as lists and hashes,
|
||||
to a C programmer and is used by Gtk+ and GNOME.
|
||||
|
||||
%package -n libgthread-2_0-0
|
||||
License: LGPLv2+
|
||||
Summary: General-Purpose Utility Library -- Library for Threads
|
||||
Group: System/Libraries
|
||||
License: LGPLv2.1+
|
||||
Summary: A Library with Convenient Functions Written in C
|
||||
Group: Development/Libraries/C and C++
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: glib2-64bit
|
||||
%endif
|
||||
#
|
||||
|
||||
%description -n libgthread-2_0-0
|
||||
GLib is a general-purpose utility library, which provides many useful
|
||||
data types, macros, type conversions, string utilities, file utilities,
|
||||
a main loop abstraction, and so on.
|
||||
|
||||
The libgthread library provides a portable way to write multi-threaded
|
||||
software.
|
||||
This library provides convenient functions, such as lists and hashes,
|
||||
to a C programmer and is used by Gtk+ and GNOME.
|
||||
|
||||
%package -n libgobject-2_0-0
|
||||
License: LGPLv2+
|
||||
Summary: General-Purpose Utility Library -- Object-Oriented Framework for C
|
||||
Group: System/Libraries
|
||||
License: LGPLv2.1+
|
||||
Summary: A Library with Convenient Functions Written in C
|
||||
Group: Development/Libraries/C and C++
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: glib2-64bit
|
||||
%endif
|
||||
#
|
||||
|
||||
%description -n libgobject-2_0-0
|
||||
GLib is a general-purpose utility library, which provides many useful
|
||||
data types, macros, type conversions, string utilities, file utilities,
|
||||
a main loop abstraction, and so on.
|
||||
|
||||
The GObject library provides an object-oriented framework for C.
|
||||
This library provides convenient functions, such as lists and hashes,
|
||||
to a C programmer and is used by Gtk+ and GNOME.
|
||||
|
||||
%lang_package
|
||||
%prep
|
||||
@ -253,8 +241,7 @@ fi
|
||||
--enable-static \
|
||||
--enable-selinux \
|
||||
--with-pcre=system \
|
||||
--enable-systemtap \
|
||||
--with-runtime-libdir=../../%{_lib}
|
||||
--enable-systemtap
|
||||
%{__make} %{?_smp_mflags}
|
||||
|
||||
%check
|
||||
@ -267,29 +254,29 @@ fi
|
||||
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
|
||||
%endif
|
||||
%find_lang %{_name}20
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
|
||||
install -D -m0644 glib2.sh %{buildroot}%{_sysconfdir}/profile.d/zzz-glib2.sh
|
||||
install -D -m0644 glib2.csh %{buildroot}%{_sysconfdir}/profile.d/zzz-glib2.csh
|
||||
install -D -m0755 SuSEconfig.glib2 %{buildroot}/sbin/conf.d/SuSEconfig.glib2
|
||||
install -D -m0644 gnome_defaults.conf %{buildroot}%{_sysconfdir}/gnome_defaults.conf
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/profile.d
|
||||
install -D -m0644 glib2.sh $RPM_BUILD_ROOT/etc/profile.d/zzz-glib2.sh
|
||||
install -D -m0644 glib2.csh $RPM_BUILD_ROOT/etc/profile.d/zzz-glib2.csh
|
||||
install -D -m0755 SuSEconfig.glib2 $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.glib2
|
||||
install -D -m0644 gnome_defaults.conf $RPM_BUILD_ROOT%{_sysconfdir}/gnome_defaults.conf
|
||||
# default apps magic
|
||||
mkdir -p %{buildroot}%{_localstatedir}/cache/gio-2.0 %{buildroot}%{_datadir}/applications
|
||||
touch %{buildroot}%{_localstatedir}/cache/gio-2.0/defaults.list
|
||||
ln -s %{_localstatedir}/cache/gio-2.0/defaults.list %{buildroot}%{_datadir}/applications/defaults.list
|
||||
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
|
||||
# gio-querymodules magic
|
||||
%if "%{_lib}" == "lib64"
|
||||
mv %{buildroot}%{_bindir}/gio-querymodules %{buildroot}%{_bindir}/gio-querymodules-64
|
||||
mv $RPM_BUILD_ROOT%{_bindir}/gio-querymodules $RPM_BUILD_ROOT%{_bindir}/gio-querymodules-64
|
||||
%endif
|
||||
touch %{buildroot}%{_libdir}/gio/modules/giomodule.cache
|
||||
touch $RPM_BUILD_ROOT%{_libdir}/gio/modules/giomodule.cache
|
||||
# gsettings magic
|
||||
touch %{buildroot}%{_datadir}/glib-2.0/schemas/gschemas.compiled
|
||||
touch $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/gschemas.compiled
|
||||
# remove files we don't care about
|
||||
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
|
||||
rm %{buildroot}%{_libdir}/gio/modules/libgiofam.a
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/gio/modules/libgiofam.*a
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||
# Install rpm macros
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/rpm
|
||||
cp %{S:5} %{buildroot}%{_sysconfdir}/rpm
|
||||
%fdupes %{buildroot}
|
||||
%fdupes $RPM_BUILD_ROOT
|
||||
|
||||
%posttrans
|
||||
# If it is an upgrade and gnome_defaults.conf were edited,
|
||||
@ -315,12 +302,11 @@ fi
|
||||
|
||||
%post -n libgmodule-2_0-0 -p /sbin/ldconfig
|
||||
|
||||
%post -n libgio-fam
|
||||
%if 0
|
||||
###############################################################################
|
||||
# Note: when updating this scriptlet, don't forget to also update baselibs.conf
|
||||
###############################################################################
|
||||
%endif
|
||||
|
||||
%post -n libgio-fam
|
||||
%if "%{_lib}" == "lib64"
|
||||
%{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules
|
||||
%else
|
||||
@ -337,12 +323,11 @@ fi
|
||||
|
||||
%postun -n libgmodule-2_0-0 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libgio-fam
|
||||
%if 0
|
||||
###############################################################################
|
||||
# Note: when updating this scriptlet, don't forget to also update baselibs.conf
|
||||
###############################################################################
|
||||
%endif
|
||||
|
||||
%postun -n libgio-fam
|
||||
%if "%{_lib}" == "lib64"
|
||||
%{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules
|
||||
%else
|
||||
@ -350,7 +335,7 @@ fi
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files tools
|
||||
%defattr(-,root,root)
|
||||
@ -377,23 +362,23 @@ rm -rf %{buildroot}
|
||||
%files -n libglib-2_0-0
|
||||
%defattr(-, root, root)
|
||||
%doc AUTHORS COPYING README NEWS ChangeLog
|
||||
/%{_lib}/libglib*.so.*
|
||||
%{_libdir}/libglib*.so.*
|
||||
|
||||
%files -n libgmodule-2_0-0
|
||||
%defattr(-, root, root)
|
||||
/%{_lib}/libgmodule*.so.*
|
||||
%{_libdir}/libgmodule*.so.*
|
||||
|
||||
%files -n libgobject-2_0-0
|
||||
%defattr(-, root, root)
|
||||
/%{_lib}/libgobject*.so.*
|
||||
%{_libdir}/libgobject*.so.*
|
||||
|
||||
%files -n libgthread-2_0-0
|
||||
%defattr(-, root, root)
|
||||
/%{_lib}/libgthread*.so.*
|
||||
%{_libdir}/libgthread*.so.*
|
||||
|
||||
%files -n libgio-2_0-0
|
||||
%defattr(-, root, root)
|
||||
/%{_lib}/libgio*.so.*
|
||||
%{_libdir}/libgio*.so.*
|
||||
%dir %{_libdir}/gio
|
||||
%dir %{_libdir}/gio/modules
|
||||
%ghost %{_libdir}/gio/modules/giomodule.cache
|
||||
@ -432,13 +417,14 @@ rm -rf %{buildroot}
|
||||
%{_includedir}/glib-2.0
|
||||
%{_includedir}/gio-unix-2.0
|
||||
%{_libdir}/lib*.so
|
||||
%{_libdir}/lib*.*a
|
||||
%dir %{_libdir}/glib-2.0/
|
||||
%{_libdir}/glib-2.0/include/
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%{_datadir}/gtk-doc/html/gio
|
||||
%{_datadir}/gtk-doc/html/glib
|
||||
%{_datadir}/gtk-doc/html/gobject
|
||||
%{_datadir}/gdb/auto-load/%{_lib}/*-gdb.py
|
||||
%{_datadir}/gdb/auto-load/%{_libdir}/*-gdb.py
|
||||
%{_datadir}/systemtap/tapset/*.stp
|
||||
%{_sysconfdir}/rpm/macros.glib2
|
||||
# Own these directories to not depend on gtk-doc while building:
|
||||
@ -447,10 +433,7 @@ rm -rf %{buildroot}
|
||||
# Own these directories to not depend on gdb
|
||||
%dir %{_datadir}/gdb
|
||||
%dir %{_datadir}/gdb/auto-load
|
||||
%dir %{_datadir}/gdb/auto-load/%{_lib}
|
||||
|
||||
%files devel-static
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/lib*.a
|
||||
%dir %{_datadir}/gdb/auto-load/%{_prefix}
|
||||
%dir %{_datadir}/gdb/auto-load/%{_prefix}/%{_lib}
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user