License corrected to "GPL-2.0-or-later AND GPL-1.0-or-later AND MIT-open-group

Reupload sources with SHA-512
2022-09-08 15:55:45 +02:00 · 2022-09-08 15:54:43 +02:00
1 changed files with 23 additions and 45 deletions
--- a/xosd.spec
+++ b/xosd.spec
@ -1,6 +1,6 @@
 Name:           xosd
 Version:        2.2.14
-Release:        48%{?dist}
+Release:        38%{?dist}
 Summary:        On-screen display library for X
 # COPYING:      GPL-2.0 text
 # man/osd_cat.1:        GPL-1.0-or-later
@ -18,20 +18,29 @@ Summary:        On-screen display library for X
 # src/xmms_plugin/dlg_font.c:   GPL-2.0-or-later
 # src/xmms_plugin/xmms_osd.c:   GPL-2.0-or-later
 ## Not in any binary package
-# aclocal.m4:   FSFULLR AND GPL-2.0-or-later WITH Autoconf-exception-generic
+# aclocal.m4:   FSFULLR AND GPL-2.0-or-later WITH an exception
+#               (<https://gitlab.com/fedora/legal/fedora-license-data/-/issues/68>)
 #               AND GPL-2.0-or-later
-# config.guess: GPL-2.0-or-later WITH Autoconf-exception-generic
-# config.sub:   GPL-2.0-or-later WITH Autoconf-exception-generic
-# configure:    FSFUL AND GPL-2.0-or-later WITH Autoconf-exception-generic
-# depcomp:      GPL-2.0-or-later WITH Autoconf-exception-generic
+# config.guess: GPL-2.0-or-later WITH an exception (under review
+#               <https://gitlab.com/fedora/legal/fedora-license-data/-/issues/68>)
+# config.sub:   GPL-2.0-or-later WITH an exception
+#               (<https://gitlab.com/fedora/legal/fedora-license-data/-/issues/68>)
+# configure:    FSFUL AND GPL-2.0-or-later WITH an exception
+#               (<https://gitlab.com/fedora/legal/fedora-license-data/-/issues/68>)
+# depcomp:      GPL-2.0-or-laterWITH an exception
+#               (<https://gitlab.com/fedora/legal/fedora-license-data/-/issues/68>)
 # INSTALL:      FSFUL
-# install-sh:   HPND-sell-variant
-# ltconfig:     GPL-2.0-or-later WITH Autoconf-exception-generic
-# ltmain.sh:    GPL-2.0-or-later WITH Autoconf-exception-generic
+# install-sh:   HPND-sell-variant-like (waiting on an identifier
+#               <https://gitlab.com/fedora/legal/fedora-license-data/-/issues/63>)
+# ltconfig:     GPL-2.0-or-later WITH an exception
+#               (<https://gitlab.com/fedora/legal/fedora-license-data/-/issues/68>)
+# ltmain.sh:    GPL-2.0-or-later WITH an exception
+#               (<https://gitlab.com/fedora/legal/fedora-license-data/-/issues/68>)
 # macros/Makefile.in:   FSFULLR
 # Makefile.in:  FSFULLR
 # man/Makefile.in:      FSFULLR
-# missing:      GPL-2.0-or-later WITH Autoconf-exception-generic
+# missing:      GPL-2.0-or-later WITH an exception
+#               (<https://gitlab.com/fedora/legal/fedora-license-data/-/issues/68>)
 # pixmaps/Makefile.in:  FSFULLR
 # script/Makefile.in:   FSFULLR
 # src/bmp_plugin/Makefile.in:   FSFULLR
@ -80,8 +89,8 @@ on-screen display.

 %prep
 %setup -q
-%patch -P0 -p0
-%patch -P1 -p1
+%patch0 -p0
+%patch1 -p1
 # XMMS is dead, gdk-pixbuf-0 is dead. Dropping xmms plug-in.
 sed -i -e '/AM_PATH_GTK/,+1 d' -e '/AM_PATH_XMMS/,+1 d' \
    -e '/AM_PATH_GDK_PIXBUF/,+1 d' configure.ac
@ -112,8 +121,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}
 %license COPYING
 %doc AUTHORS ChangeLog README TODO
 %{_bindir}/osd_cat
-%{_libdir}/libxosd.so.2
-%{_libdir}/libxosd.so.2.*
+%{_libdir}/libxosd.so.*
 %{_mandir}/man1/osd_cat.1*

 %files devel
@ -125,39 +133,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{_mandir}/man3/xosd*.3*

 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-48
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Tue Jan 20 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-47
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-46
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-45
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-44
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-43
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-42
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-41
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Sep 08 2022 Petr Pisar <ppisar@redhat.com> - 2.2.14-40
+* Thu Sep 08 2022 Petr Pisar <ppisar@redhat.com> - 2.2.14-38
 - License corrected to "GPL-2.0-or-later AND GPL-1.0-or-later AND MIT-open-group

-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-39
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-38
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.14-37
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Author	SHA1	Message	Date
Petr Písař	efb13ae446	License corrected to "GPL-2.0-or-later AND GPL-1.0-or-later AND MIT-open-group	2022-09-08 15:55:45 +02:00
Petr Písař	5ce7439919	Reupload sources with SHA-512	2022-09-08 15:54:43 +02:00