From 6766d2081e1ec815af9f712e77bcbd43acc8cca4 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sun, 23 Jun 2024 14:01:19 +0200 Subject: [PATCH] source renamed from GConf to gconf update to 3.2.6+20151014git.07808097 specfile fixes [release 3.2.6+20151014git.07808097-1mamba;Sat Jun 22 2024] --- README.md | 2 +- GConf.spec => gconf.spec | 86 +++++++++++++++++++++++----------------- 2 files changed, 50 insertions(+), 38 deletions(-) rename GConf.spec => gconf.spec (84%) diff --git a/README.md b/README.md index f877968..d8d698c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# GConf +# gconf The GConf package contains a configuration database system. diff --git a/GConf.spec b/gconf.spec similarity index 84% rename from GConf.spec rename to gconf.spec index 20b41d1..5fc9bed 100644 --- a/GConf.spec +++ b/gconf.spec @@ -1,44 +1,36 @@ %define majver %(echo %version | cut -d. -f 1-2) -Name: GConf -Version: 3.2.6 -Release: 4mamba +%define git_commit %(echo %version | cut -d+ -f2 | cut -d. -f2) +Name: gconf +Version: 3.2.6+20151014git.07808097 +Release: 1mamba Summary: The GConf package contains a configuration database system Group: System/Libraries Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://www.gnome.org -# bugfixes: http://ftp.acc.umu.se/pub/GNOME/sources/%{pkgname} -Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{majver}/%{name}-%{version}.tar.xz +URL: https://www.gnome.org/ +Source: https://gitlab.gnome.org/Archive/gconf.git/master@%{git_commit}/gconf-%{version}.tar.bz2 Patch0: GConf-3.2.6-xml-gettext-domain.patch Patch1: GConf-3.2.6-reload.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: ldconfig BuildRequires: libORBit2-devel BuildRequires: libdbus-devel BuildRequires: libdbus-glib-devel -BuildRequires: libe2fs-devel BuildRequires: libglib-devel -BuildRequires: libkrb5-devel -BuildRequires: liblzma-devel BuildRequires: libopenldap-devel -BuildRequires: libopenssl-devel BuildRequires: libpolkit-devel -BuildRequires: libsasl2-devel BuildRequires: libsystemd-devel BuildRequires: libxml2-devel -BuildRequires: libz-devel ## AUTOBUILDREQ-END BuildRequires: pkgconfig BuildRequires: gettext-devel BuildRequires: ORBit2 Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} Requires: ORBit2 -Obsoletes: gconf -Provides: gconf = %{?epoch:%epoch:}%{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Provides: GConf +Obsoletes: GConf <= 3.2.6-4mamba %description The GConf package contains a configuration database system. @@ -46,6 +38,8 @@ The GConf package contains a configuration database system. %package -n lib%{name} Group: System/Libraries Summary: Shared libraries for %{name} +Provides: libGConf +Obsoletes: libGConf <= 3.2.6-4mamba %description -n lib%{name} The GConf package contains a configuration database system. @@ -58,14 +52,16 @@ Requires: libxml2-devel Requires: ORBit2-devel Requires: libglib-devel Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} -Obsoletes: gconf-devel -Provides: gconf-devel = %{?epoch:%epoch:}%{version}-%{release} +Provides: gconf-devel +Obsoletes: gconf-devel <= 3.2.6-4mamba Provides: GConf-devel -Obsoletes: GConf-devel +Obsoletes: GConf-devel <= 3.2.6-4mamba +Provides: libGConf-devel +Obsoletes: libGConf-devel <= 3.2.6-4mamba %description -n lib%{name}-devel The GConf package contains a configuration database system. -This package contains static libraries and header files need for development. +This package contains static libraries and header files needed for development. %package apidocs Summary: %{pkgname} API documentation @@ -79,18 +75,29 @@ Requires: gtk-doc %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch 0 -p1 +%patch 1 -p1 + +# From Arch: +# The following line copied from Fedora +# https://src.fedoraproject.org/rpms/GConf2/blob/70ed26d67b563d858a84505622d11f41879a6b37/f/GConf2.spec#_90 +2to3 --write --nobackup gsettings/gsettings-schema-convert + +sed -i '1s|#!/usr/bin/env python$|#!/usr/bin/python|' gsettings/gsettings-schema-convert + +NOCONFIGURE=1 ./autogen.sh %build %configure \ - --libexecdir=%{_sbindir} \ + --libexecdir=%{_bindir} \ --sysconfdir=%{_sysconfdir} \ - --with-gtk=2.0 + --enable-defaults-service -# --enable-gtk-doc \ +# --enable-gtk-doc -%make -j1 +%make + +%check %make -j1 check %install @@ -147,7 +154,8 @@ exit 0 %{_bindir}/gconftool* %{_bindir}/gconf-merge-tree %{_bindir}/gsettings-* -%{_sbindir}/* +%{_bindir}/gconf-defaults-mechanism +%{_bindir}/gconfd-2 %{_datadir}/GConf/schema/evoldap.schema %{_datadir}/polkit-1/actions/org.gnome.gconf.defaults.policy %{_datadir}/dbus-1/services/org.gnome.GConf.service @@ -157,32 +165,36 @@ exit 0 %files -n lib%{name} %defattr(-,root,root) -%{_libdir}/*.so.* +%{_libdir}/libgconf-2.so.* %{_libdir}/GConf/2/libgconfbackend-evoldap.a %{_libdir}/GConf/2/libgconfbackend-evoldap.so %{_libdir}/GConf/2/libgconfbackend-oldxml.a %{_libdir}/GConf/2/libgconfbackend-oldxml.so %{_libdir}/GConf/2/libgconfbackend-xml.a %{_libdir}/GConf/2/libgconfbackend-xml.so +%{_libdir}/gio/modules/libgsettingsgconfbackend.* %{_libdir}/girepository-1.0/GConf-2.0.typelib %files -n lib%{name}-devel %defattr(-,root,root) -%{_datadir}/aclocal/* +%dir %{_includedir}/gconf %{_includedir}/gconf/* -%{_libdir}/*.la -%{_libdir}/*.a -%{_libdir}/*.so -%{_libdir}/GConf/2/*.la +%{_libdir}/libgconf-2.a +%{_libdir}/libgconf-2.so %{_libdir}/pkgconfig/*.pc -%{_libdir}/gio/modules/libgsettingsgconfbackend.* +%{_datadir}/aclocal/* %{_datadir}/gir-1.0/GConf-2.0.gir -%files apidocs -%defattr(-,root,root) -%{_datadir}/gtk-doc/html/gconf/* +#%files apidocs +#%defattr(-,root,root) +#%{_datadir}/gtk-doc/html/gconf/* %changelog +* Sat Jun 22 2024 Silvan Calarco 3.2.6+20151014git.07808097-1mamba +- source renamed from GConf to gconf +- update to 3.2.6+20151014git.07808097 +- specfile fixes + * Tue Dec 01 2020 Silvan Calarco 3.2.6-4mamba - rebuilt with debug package and patch from Fedora to reload after installing schemas