Add dep for gobject-introspection explicitly

SPDX migration

sources

@@ -1,2 +1 @@
 SHA512 (wallpapoz-0.6.2.tar.bz2) = 36ed198ba72e08f33ed92dca173f41eb7e7d307366ad42b7cfac2659511f42980351eeb4c02f155469fdf75be79fad37d77bb02118ad91f39da22dae5246860b
-SHA512 (wallpapoz-0.6.2-builder.tar.bz2) = a1e567ca0fa5dde9ba1eb0d143c1618789fc6fff50e09390ea8edde2afd8cdf5d9e95ace8e287a3791766f5a2369717e1a3a81c17a7197c04cc988d6d0a89346

wallpapoz-glade-builder-convert.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/bash
 set -x
+set -e
 
 ORIG_XML=./share/wallpapoz/glade/wallpapoz.glade
 NEWTOPDIR=wallpapoz-0.6.2-builder

wallpapoz.spec

@@ -7,33 +7,34 @@
 
 %define         mainver         0.6.2
 %undefine         betaver
-#%%define         svnver          svn92_trunk
-%define         fedorarel		11
+%define         baserelease		20
 
-%define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
+%define         rel             %{?betaver:0.}%{baserelease}%{?betaver:.%betaver}
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}.1
+Release:        %{rel}%{?dist}
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
-License:        GPLv2+
+# GPL-2.0-or-later    README
+# GFDL-1.1-or-later   share/gnome/help/wallpapoz/C/legal.xml
+# SPDX confirmed
+License:        GPL-2.0-or-later AND GFDL-1.1-or-later
+
 URL:            http://vajrasky.wordpress.com/wallpapoz/
-Source0:        https://github.com/downloads/vajrasky/wallpapoz/%{name}-%{mainver}%{?svnver:-%svnver}%{?betaver:%betaver}.tar.bz2
-%if 0%{?fedora} >= 12
+Source0:        https://github.com/downloads/vajrasky/wallpapoz/%{name}-%{mainver}%{?betaver:%betaver}.tar.bz2
 Source11:       wallpapoz-autostart.desktop
-%endif
 # Install daemon_wallpapoz wrapper script, which may
 # fix 584980, 597687?
 # and 711541
-Source12:	daemon_wallpapoz-wrapper
+Source12:       daemon_wallpapoz-wrapper
 #
 # Glade XML converted to GTK builder script
-Source21:	wallpapoz-0.6.2-builder.tar.bz2
+# Source21:	wallpapoz-0.6.2-builder.tar.bz2
 # Source21 is generated by the following script.
-# Note that the following script uses "gtk-builder-convert" in gtk2-devel, which is currently written
-# in python2, so we generate Source21 beforehand
-Source22:	wallpapoz-glade-builder-convert.sh
+# Note that the following script uses "gtk-builder-convert" in gtk2-devel
+# Now "gtk-builder-convert" is imported to python3, so don't use Source21
+Source22:       wallpapoz-glade-builder-convert.sh
 #
 # Misc fixes for daemon_wallpapoz under compiz working,
 # containing fix for bug 531342, 542244, bug 567437, bug 573642
@@ -100,10 +101,12 @@ BuildArch:      noarch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
+BuildRequires:  gobject-introspection
 BuildRequires:  python3-devel
 BuildRequires:  python3-imaging
 BuildRequires:  gtk3
 BuildRequires:  python3-gobject
+BuildRequires:  /usr/bin/gtk-builder-convert
 #BuildRequires:  gnome-python2
 # See bug 456122
 %if 0%{?fedora} >= 10
@@ -112,46 +115,43 @@ BuildRequires:  python3-gobject
 # Because wallpapoz uses gconftool-2 or so
 Requires:       GConf2
 Requires:       gtk3
+Requires:       gobject-introspection
 Requires:       python3-gobject
 Requires:       python3-imaging
 #Requires:       gnome-python2-gnome
-Requires:       xorg-x11-utils
-Requires:       %{_bindir}/kill
-Requires:       %{_bindir}/pgrep
+Requires:       xprop xwininfo
+Requires:       /usr/bin/kill
+Requires:       /usr/bin/pgrep
 
 %description
 This tool enables your Gnome desktop to have different 
 wallpapers for different workspaces or virtual desktops.
 
 %prep
-%setup -q -n %{name}-%{version}%{?svnver:-%svnver} -a 21
-%patch0 -p1 -b .respawn
-%patch2 -p1 -b .dircheck
-%patch3 -p1 -b .noitem
-%patch4 -p1 -b .patch_init
-%patch5 -p1 -b .kill_nox
-%patch6 -p1 -b .kill_multi
-%patch7 -p1 -b .anime
-%patch8 -p1 -b .nonutf8
-%patch9 -p1 -b .deletelastone
-%patch10 -p1 -b .deletefirst
-%patch12 -p1 -b .workspace_img
-%patch13 -p1 -b .workspace_num_incr
-%patch14 -p1 -b .default
-%patch15 -p1 -b .pil
-%patch16 -p1 -b .LXDE
-%patch17 -p1 -b .MATE
-%patch18 -p1 -b .CINNAMON
-
-# Umm... permission fix
-find . -type f -print0 | xargs -0 chmod 0644
-grep -rl --null '#!/usr/bin' . | xargs -0 chmod 0755
+%setup -q -n %{name}-%{version}%{?svnver:-%svnver}
+%patch -P0 -p1 -b .respawn
+%patch -P2 -p1 -b .dircheck
+%patch -P3 -p1 -b .noitem
+%patch -P4 -p1 -b .patch_init
+%patch -P5 -p1 -b .kill_nox
+%patch -P6 -p1 -b .kill_multi
+%patch -P7 -p1 -b .anime
+%patch -P8 -p1 -b .nonutf8
+%patch -P9 -p1 -b .deletelastone
+%patch -P10 -p1 -b .deletefirst
+%patch -P12 -p1 -b .workspace_img
+%patch -P13 -p1 -b .workspace_num_incr
+%patch -P14 -p1 -b .default
+%patch -P15 -p1 -b .pil
+%patch -P16 -p1 -b .LXDE
+%patch -P17 -p1 -b .MATE
+%patch -P18 -p1 -b .CINNAMON
 
 grep -rl --null '/usr/bin/env python$' . | \
 	xargs --null sed -i -e 's|/usr/bin/env python|/usr/bin/python2|'
 
-%patch31 -p1 -b .py3
-%patch32 -p1 -b .py3.desktop
+%patch -P31 -p1 -b .py3
+%patch -P32 -p1 -b .py3.desktop
 
 # For setup
 mkdir TMPBINDIR
@@ -163,6 +163,9 @@ popd
 ln -sf c share/gnome/help/wallpapoz/C
 
 %build
+bash %{SOURCE22}
+find . -type f -print0 | xargs -0 chmod 0644
+grep -rl --null '#!/usr/bin' . | xargs -0 chmod 0755
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -174,20 +177,15 @@ export PATH=$(pwd)/TMPBINDIR:$PATH
 %{__sed} -i -e 's|%{name}\.png|%{name}|' \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 desktop-file-install \
-%if 0%{?fedora} < 19
-   --vendor fedora \
-%endif
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    --delete-original \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 # Install desktop application autostart stuff
-%if 0%{?fedora} >= 12
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart
 desktop-file-install \
 	--dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart \
 	%{SOURCE11}
-%endif
 
 # Install daemon_wallpapoz wrapper script
 pushd ${RPM_BUILD_ROOT}
@@ -207,22 +205,67 @@ install -cpm 0644  \
 %{find_lang} %{name}
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc COPYING README
-%{_bindir}/*%{name}
+%license COPYING
+%doc     README
+%{_bindir}/%{name}
+%{_bindir}/daemon_wallpapoz
 %{_libexecdir}/daemon_wallpapoz
 
-%if 0%{?fedora} >= 12
 %{_sysconfdir}/xdg/autostart/wallpapoz-autostart.desktop
-%endif
 
-%{_datadir}/%{name}/
+%dir %{_datadir}/%{name}/
+%{_datadir}/%{name}/glade/
+%{_datadir}/%{name}/lib/
 %{_datadir}/gnome/help/%{name}/
 
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/*%{name}.desktop
 
 %changelog
+* Sat Nov 08 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-20
+- Add dep for gobject-introspection explicitly
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Nov 21 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-15
+- Clean up release number and some spec file stuff
+- SPDX migration
+
+* Sat Jul 22 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-14.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-13.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-13.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-13.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Nov  5 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.2-13
+- Use python3-ported gtk-builder-convert in build time instead of
+  glade files generated preliminarily
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-12.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-12.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Adam Jackson <ajax@redhat.com> - 0.6.2-12.1
+- Require xprop xwininfo, not xorg-x11-utils
+
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-11.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild