diff --git a/.gitignore b/.gitignore index 6cbdf51..56f453a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,3 @@ dbus-glib-0.88.tar.gz /dbus-glib-0.106.tar.gz /dbus-glib-0.108.tar.gz /dbus-glib-0.110.tar.gz -/dbus-glib-0.112.tar.gz -/dbus-glib-0.112.tar.gz.asc diff --git a/dbus-glib.spec b/dbus-glib.spec index ec611bd..3b9b3c5 100644 --- a/dbus-glib.spec +++ b/dbus-glib.spec @@ -2,31 +2,21 @@ %global glib2_version 2.40.0 %global dbus_version 1.8 -Name: dbus-glib -Version: 0.112 -Release: 11%{?dist} Summary: GLib bindings for D-Bus - -# dbus/dbus-bash-completion-helper.c is GPL-2.0-or-later -# some tests are (LGPL-2.1-or-later OR MIT) AND MIT, but not included in rpm -License: (AFL-2.1 OR GPL-2.0-or-later) AND GPL-2.0-or-later -URL: https://www.freedesktop.org/software/dbus/ -#VCS: git:https://gitlab.freedesktop.org/dbus/dbus-glib.git +Name: dbus-glib +Version: 0.110 +Release: 3%{?dist} +URL: http://www.freedesktop.org/software/dbus/ +#VCS: git:git://git.freedesktop.org/git/dbus/dbus-glib Source0: https://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz -Source1: https://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz.asc -# gpg --keyserver keyring.debian.org --recv-keys 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F -# gpg --export --export-options export-minimal 0x36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F > gpgkey-36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F.gpg -Source2: gpgkey-36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F.gpg - +License: AFL and GPLv2+ +Group: System Environment/Libraries +BuildRequires: gcc BuildRequires: pkgconfig(dbus-1) >= %{dbus_version} BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} BuildRequires: expat-devel >= %{expat_version} -BuildRequires: /usr/bin/chrpath -BuildRequires: dbus-daemon -BuildRequires: gcc BuildRequires: gettext -BuildRequires: gnupg2 -BuildRequires: make +BuildRequires: /usr/bin/chrpath %description @@ -35,6 +25,7 @@ the GLib thread abstraction and main loop. %package devel Summary: Libraries and headers for the D-Bus GLib bindings +Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -42,24 +33,21 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Headers and static libraries for the D-Bus GLib bindings %prep -%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%autosetup -p1 +%setup -q %build -%set_build_flags -export CFLAGS="$CFLAGS -std=gnu17" %configure --enable-tests=yes \ --enable-asserts=yes \ --disable-gtk-doc -%make_build +make %{?_smp_mflags} V=1 %check -%make_build check +make check %install -%make_install +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.la @@ -71,7 +59,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/dbus-bash-completion-helper chmod -x $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/dbus-bash-completion.sh -%ldconfig_scriptlets +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig %files %doc NEWS @@ -90,65 +80,6 @@ chmod -x $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/dbus-bash-completion.sh %changelog -* Wed Jul 23 2025 Fedora Release Engineering - 0.112-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 0.112-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 17 2024 Fedora Release Engineering - 0.112-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 0.112-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 0.112-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 0.112-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 0.112-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 0.112-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 0.112-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 0.112-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Mar 26 2021 David King - 0.112-1 -- Update to 0.112 - -* Tue Jan 26 2021 Fedora Release Engineering - 0.110-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sat Aug 01 2020 Fedora Release Engineering - 0.110-10 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 0.110-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 13 2020 Tom Stellard - 0.110-8 -- Use make macros -- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro - -* Tue Jan 28 2020 Fedora Release Engineering - 0.110-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 0.110-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 10 2019 Scott Talbert - 0.110-5 -- Add dbus-daemon to BRs to fix FTBFS (#1674792) - -* Thu Jan 31 2019 Fedora Release Engineering - 0.110-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - * Thu Jul 12 2018 Fedora Release Engineering - 0.110-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/gpgkey-36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F.gpg b/gpgkey-36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F.gpg deleted file mode 100644 index 4a5c6f8..0000000 Binary files a/gpgkey-36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F.gpg and /dev/null differ diff --git a/sources b/sources index 25b41ae..ad16ca9 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (dbus-glib-0.112.tar.gz) = 7c9f393f065dfb3d698f35e6554caf15fe539f5dd52d2b2bb6ed1770e130f5dab8e45379232520301455bae9bb77e25a109faf175153fcd4b9dd11d7de4a546e -SHA512 (dbus-glib-0.112.tar.gz.asc) = deaa0978ec2740fd6db3e851b597d62996a700a684fab5472e481e219f66c9dee5e001844f56c7bdab7daf69aacd3ac4774aacc7b601dad0004b74a0136c61a8 +SHA512 (dbus-glib-0.110.tar.gz) = c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54