diff --git a/1.5-fix-parce_cmd_line.patch b/1.5-fix-parce_cmd_line.patch new file mode 100644 index 0000000..d684af2 --- /dev/null +++ b/1.5-fix-parce_cmd_line.patch @@ -0,0 +1,13 @@ +diff --git a/docker.c b/docker.c +index 17a2f0b..7696bf8 100644 +--- a/docker.c ++++ b/docker.c +@@ -329,7 +329,7 @@ int main(int c, char **v) + sigaction(SIGINT, &act, NULL); + sigaction(SIGHUP, &act, NULL); + +- parse_cmd_line(argc, argv); ++ parse_cmd_line(); + + display = XOpenDisplay(display_string); + if (!display) { diff --git a/changelog b/changelog new file mode 100644 index 0000000..604bc8d --- /dev/null +++ b/changelog @@ -0,0 +1,109 @@ +* Sun Jan 19 2025 Fedora Release Engineering - 1.5-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 26 2024 Miroslav Suchý - 1.5-34 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 1.5-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.5-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 1.5-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.5-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.5-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1.5-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.5-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.5-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 1.5-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 1.5-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.5-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.5-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.5-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.5-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.5-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.5-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 1.5-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.5-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Nov 10 2014 Matthew Miller - 1.5-15 +- rebuild for f22+ Obsoletes change (bug #1118880) + +* Mon Aug 18 2014 Fedora Release Engineering - 1.5-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 1.5-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Sep 10 2013 Andreas Bierfert +- 1.5-12 +- rename binary to wmdocker as well +- cleanup spec + +* Sat Sep 07 2013 Andreas Bierfert +- 1.5-11 +- rename to wmdocker (fpc#341) + +* Sat Aug 03 2013 Fedora Release Engineering - 1.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 1.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 1.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 1.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 1.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jul 24 2009 Fedora Release Engineering - 1.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Feb 24 2009 Fedora Release Engineering - 1.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Feb 11 2008 Andreas Bierfert - 1.5-3 +- Rebuilt for gcc43 + +* Mon Oct 15 2007 Andreas Bierfert +- 1.5-2 +- add new license tag + +* Sat Jun 02 2007 Andreas Bierfert +- 1.5-1 +- initial version diff --git a/wmdocker.spec b/wmdocker.spec index fb87462..c663fea 100644 --- a/wmdocker.spec +++ b/wmdocker.spec @@ -1,23 +1,20 @@ Name: wmdocker Version: 1.5 -Release: 28%{?dist} +Release: 39%{?dist} Summary: KDE and GNOME2 system tray replacement docking application -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://icculus.org/openbox/2/docker/ Source0: http://icculus.org/openbox/2/docker/docker-1.5.tar.gz -BuildRequires: make +Patch0: 1.5-fix-parce_cmd_line.patch + +BuildRequires: make BuildRequires: gcc BuildRequires: glib2-devel BuildRequires: libX11-devel -# https://fedorahosted.org/fpc/ticket/341 -# keep obsoletes for two release 20 and 21 -%if !0%{?fedora} < 22 -Obsoletes: docker <= 1.5-10 -%endif - %description Docker is a docking application (WindowMaker dock app) which acts as a system tray for KDE and GNOME2. It can be used to replace the panel in either @@ -25,113 +22,34 @@ environment, allowing you to have a system tray without running the KDE/GNOME panel or environment. %prep -%setup -q -n docker-%{version} +%autosetup -n docker-%{version} %build -make %{?_smp_mflags} CFLAGS="%{optflags}" XLIBPATH=%{_libdir}/X11 +%make_build CFLAGS="%{optflags}" XLIBPATH=%{_libdir}/X11 %install -rm -rf %{buildroot} -mkdir -p %{buildroot}/%{_bindir} -make install PREFIX=%{buildroot}/%{_prefix} -# due to package rename to prevent conflicts with the new docker package -# see https://fedorahosted.org/fpc/ticket/341 +%__mkdir_p %{buildroot}%{_bindir} +%make_install PREFIX=%{buildroot}/%{_prefix} +# due to package rename to prevent conflicts with docker mv %{buildroot}/%{_bindir}/docker %{buildroot}/%{_bindir}/wmdocker %files -%doc README COPYING +%doc README +%license COPYING %{_bindir}/wmdocker %changelog -* Sat Jan 22 2022 Fedora Release Engineering - 1.5-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild +* Fri Jul 17 2026 Fedora Release Engineering - 1.5-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild -* Fri Jul 23 2021 Fedora Release Engineering - 1.5-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild +* Sat Jan 17 2026 Fedora Release Engineering - 1.5-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild -* Wed Jan 27 2021 Fedora Release Engineering - 1.5-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Fri Jul 25 2025 Fedora Release Engineering - 1.5-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild -* Fri Jan 31 2020 Fedora Release Engineering - 1.5-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.5-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.5-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.5-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.5-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.5-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.5-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.5-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1.5-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.5-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Nov 10 2014 Matthew Miller - 1.5-15 -- rebuild for f22+ Obsoletes change (bug #1118880) - -* Mon Aug 18 2014 Fedora Release Engineering - 1.5-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.5-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Sep 10 2013 Andreas Bierfert -- 1.5-12 -- rename binary to wmdocker as well -- cleanup spec - -* Sat Sep 07 2013 Andreas Bierfert -- 1.5-11 -- rename to wmdocker (fpc#341) - -* Sat Aug 03 2013 Fedora Release Engineering - 1.5-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 1.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 1.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 1.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 1.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Jul 24 2009 Fedora Release Engineering - 1.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Feb 24 2009 Fedora Release Engineering - 1.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Feb 11 2008 Andreas Bierfert - 1.5-3 -- Rebuilt for gcc43 - -* Mon Oct 15 2007 Andreas Bierfert -- 1.5-2 -- add new license tag - -* Sat Jun 02 2007 Andreas Bierfert -- 1.5-1 -- initial version +%autochangelog