[rpms/glib2] cve-2026-58016-f44: avoid multilib conflicts

[rpms/glib2] cve-2026-58016-f44: avoid multilib conflicts

[Matthias Clasen]

A new commit has been pushed.

Repo   : rpms/glib2
Branch : cve-2026-58016-f44
Commit : 84e96bd153a68d892461638013516e9a4f299929
Author : Matthias Clasen <mclasen@fedoraproject.org>
Date   : 2009-09-25T15:04:59+00:00
Stats  : +6/-3 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/glib2/c/84e96bd153a68d892461638013516e9a4f299929?branch=cve-2026-58016-f44

Log:
avoid multilib conflicts

---
diff --git a/glib2.spec b/glib2.spec
index 3df89e9..2040110 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.22.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -81,8 +81,6 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.{a,la}
 
-# These cause multilib conflicts, and we don't really need precompiled
-# versions of these tiny scripts
 rm -f $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb/*.{pyc,pyo}
 
 %find_lang glib20
@@ -115,6 +113,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*
 %{_libdir}/pkgconfig/*
 %{_datadir}/glib-2.0
+%exclude %{_datadir}/glib-2.0/gdb/*.pyo
+%exclude %{_datadir}/glib-2.0/gdb/*.pyc
 %{_bindir}/*
 %doc %{_datadir}/gtk-doc/html/*
 %doc %{_mandir}/man1/*
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Fri Sep 25 2009 Matthias Clasen <mclasen@redhat.com> - 2.22.0-4
+- Avoid multilib conflicts even harder
+
 * Thu Sep 24 2009 Matthias Clasen <mclasen@redhat.com> - 2.22.0-3
 - Avoid multilib conflicts (#525213)
 

[rpms/glib2] cve-2026-58016-f44: Avoid multilib conflicts

[Matthias Clasen]

A new commit has been pushed.

Repo   : rpms/glib2
Branch : cve-2026-58016-f44
Commit : 7a7333dd4df7c0892c74587e75ddd83d1f9ba9f8
Author : Matthias Clasen <mclasen@fedoraproject.org>
Date   : 2009-09-24T14:30:56+00:00
Stats  : +8/-1 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/glib2/c/7a7333dd4df7c0892c74587e75ddd83d1f9ba9f8?branch=cve-2026-58016-f44

Log:
Avoid multilib conflicts

---
diff --git a/glib2.spec b/glib2.spec
index 4be0f36..3df89e9 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.22.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -81,6 +81,10 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.{a,la}
 
+# These cause multilib conflicts, and we don't really need precompiled
+# versions of these tiny scripts
+rm -f $RPM_BUILD_ROOT%{_datadir}/glib-2.0/gdb/*.{pyc,pyo}
+
 %find_lang glib20
 
 %clean
@@ -123,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Thu Sep 24 2009 Matthias Clasen <mclasen@redhat.com> - 2.22.0-3
+- Avoid multilib conflicts (#525213)
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen@redhat.com> - 2.22.0-2
 - Fix location of gdb macros