From f922425f8506565c2d1187ff93e5529031b0c758 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 23:12:26 -0500 Subject: [PATCH 01/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- wxpropgrid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxpropgrid.spec b/wxpropgrid.spec index 5292bea..e2d2300 100644 --- a/wxpropgrid.spec +++ b/wxpropgrid.spec @@ -3,7 +3,7 @@ Name: wxpropgrid Version: 1.4.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A property sheet control for wxWidgets Group: Applications/Engineering @@ -91,5 +91,8 @@ make install DESTDIR=%{buildroot} %{_includedir}/wx-2.8/wx/propgrid %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 1.4.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Dec 13 2011 Volker Fröhlich - 1.4.15-1 - Initial package From ae312e6852376eeca745e8d5b859151fcff12393 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 21:22:54 -0600 Subject: [PATCH 02/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- wxpropgrid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxpropgrid.spec b/wxpropgrid.spec index e2d2300..21fa681 100644 --- a/wxpropgrid.spec +++ b/wxpropgrid.spec @@ -3,7 +3,7 @@ Name: wxpropgrid Version: 1.4.15 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A property sheet control for wxWidgets Group: Applications/Engineering @@ -91,6 +91,9 @@ make install DESTDIR=%{buildroot} %{_includedir}/wx-2.8/wx/propgrid %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 1.4.15-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 22 2012 Fedora Release Engineering - 1.4.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 712af0804b97a33030295ce561e931c2873dae2e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 02:25:47 -0500 Subject: [PATCH 03/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- wxpropgrid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxpropgrid.spec b/wxpropgrid.spec index 21fa681..bb86a68 100644 --- a/wxpropgrid.spec +++ b/wxpropgrid.spec @@ -3,7 +3,7 @@ Name: wxpropgrid Version: 1.4.15 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A property sheet control for wxWidgets Group: Applications/Engineering @@ -91,6 +91,9 @@ make install DESTDIR=%{buildroot} %{_includedir}/wx-2.8/wx/propgrid %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.4.15-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Feb 15 2013 Fedora Release Engineering - 1.4.15-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From ca65468e7f91856ed9921d78dbbe6ebf675593bc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 00:03:06 -0500 Subject: [PATCH 04/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- wxpropgrid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxpropgrid.spec b/wxpropgrid.spec index bb86a68..88f89a3 100644 --- a/wxpropgrid.spec +++ b/wxpropgrid.spec @@ -3,7 +3,7 @@ Name: wxpropgrid Version: 1.4.15 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A property sheet control for wxWidgets Group: Applications/Engineering @@ -91,6 +91,9 @@ make install DESTDIR=%{buildroot} %{_includedir}/wx-2.8/wx/propgrid %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.4.15-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 1.4.15-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 24577034d35e861d43deedcac9bec3363d3e3502 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 09:03:37 +0000 Subject: [PATCH 05/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- wxpropgrid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxpropgrid.spec b/wxpropgrid.spec index 88f89a3..f379ff9 100644 --- a/wxpropgrid.spec +++ b/wxpropgrid.spec @@ -3,7 +3,7 @@ Name: wxpropgrid Version: 1.4.15 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A property sheet control for wxWidgets Group: Applications/Engineering @@ -91,6 +91,9 @@ make install DESTDIR=%{buildroot} %{_includedir}/wx-2.8/wx/propgrid %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.4.15-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 1.4.15-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From efedc42843d6066da2674aa2e24027b0c6d3ee0d Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 18:38:57 +0200 Subject: [PATCH 06/18] Rebuilt for GCC 5 C++11 ABI change --- wxpropgrid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxpropgrid.spec b/wxpropgrid.spec index f379ff9..310c7ce 100644 --- a/wxpropgrid.spec +++ b/wxpropgrid.spec @@ -3,7 +3,7 @@ Name: wxpropgrid Version: 1.4.15 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A property sheet control for wxWidgets Group: Applications/Engineering @@ -91,6 +91,9 @@ make install DESTDIR=%{buildroot} %{_includedir}/wx-2.8/wx/propgrid %changelog +* Sat May 02 2015 Kalev Lember - 1.4.15-7 +- Rebuilt for GCC 5 C++11 ABI change + * Mon Aug 18 2014 Fedora Release Engineering - 1.4.15-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From b22abf0d80e7abbb72843bd5afbe7172ed8eaeac Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 02:40:02 +0000 Subject: [PATCH 07/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- wxpropgrid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxpropgrid.spec b/wxpropgrid.spec index 310c7ce..05c9db0 100644 --- a/wxpropgrid.spec +++ b/wxpropgrid.spec @@ -3,7 +3,7 @@ Name: wxpropgrid Version: 1.4.15 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A property sheet control for wxWidgets Group: Applications/Engineering @@ -91,6 +91,9 @@ make install DESTDIR=%{buildroot} %{_includedir}/wx-2.8/wx/propgrid %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1.4.15-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 1.4.15-7 - Rebuilt for GCC 5 C++11 ABI change From ca18f302ee9191254a52ec128f2a1fc359ebb17d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:13:06 +0000 Subject: [PATCH 08/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- wxpropgrid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxpropgrid.spec b/wxpropgrid.spec index 05c9db0..b45e32f 100644 --- a/wxpropgrid.spec +++ b/wxpropgrid.spec @@ -3,7 +3,7 @@ Name: wxpropgrid Version: 1.4.15 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A property sheet control for wxWidgets Group: Applications/Engineering @@ -91,6 +91,9 @@ make install DESTDIR=%{buildroot} %{_includedir}/wx-2.8/wx/propgrid %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1.4.15-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 1.4.15-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 3c39694ddd1181f0daced5937264af4490b6d75e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:35:48 +0000 Subject: [PATCH 09/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- wxpropgrid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxpropgrid.spec b/wxpropgrid.spec index b45e32f..973efec 100644 --- a/wxpropgrid.spec +++ b/wxpropgrid.spec @@ -3,7 +3,7 @@ Name: wxpropgrid Version: 1.4.15 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A property sheet control for wxWidgets Group: Applications/Engineering @@ -91,6 +91,9 @@ make install DESTDIR=%{buildroot} %{_includedir}/wx-2.8/wx/propgrid %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.4.15-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 1.4.15-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From ddb8d655da77f7fb4842c2ceaf2df40372307836 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:49:36 +0000 Subject: [PATCH 10/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- wxpropgrid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxpropgrid.spec b/wxpropgrid.spec index 973efec..15bc84b 100644 --- a/wxpropgrid.spec +++ b/wxpropgrid.spec @@ -3,7 +3,7 @@ Name: wxpropgrid Version: 1.4.15 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A property sheet control for wxWidgets Group: Applications/Engineering @@ -91,6 +91,9 @@ make install DESTDIR=%{buildroot} %{_includedir}/wx-2.8/wx/propgrid %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.4.15-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 1.4.15-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 984649fecd6637c9576ea5c1ac9933ee4523b8f6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:25:14 +0000 Subject: [PATCH 11/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- wxpropgrid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxpropgrid.spec b/wxpropgrid.spec index 15bc84b..db0ccfd 100644 --- a/wxpropgrid.spec +++ b/wxpropgrid.spec @@ -3,7 +3,7 @@ Name: wxpropgrid Version: 1.4.15 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A property sheet control for wxWidgets Group: Applications/Engineering @@ -91,6 +91,9 @@ make install DESTDIR=%{buildroot} %{_includedir}/wx-2.8/wx/propgrid %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.4.15-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.4.15-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 5fc00617290ac3e1bd14e7f6b1745bb4dd756bf9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:14:58 +0000 Subject: [PATCH 12/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wxpropgrid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxpropgrid.spec b/wxpropgrid.spec index db0ccfd..1a34302 100644 --- a/wxpropgrid.spec +++ b/wxpropgrid.spec @@ -3,7 +3,7 @@ Name: wxpropgrid Version: 1.4.15 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A property sheet control for wxWidgets Group: Applications/Engineering @@ -91,6 +91,9 @@ make install DESTDIR=%{buildroot} %{_includedir}/wx-2.8/wx/propgrid %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.4.15-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1.4.15-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From dda7a60c5807f128b8d8793af8a06f92bc3dad36 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:53 +0200 Subject: [PATCH 13/18] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- wxpropgrid.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wxpropgrid.spec b/wxpropgrid.spec index 1a34302..19a44c2 100644 --- a/wxpropgrid.spec +++ b/wxpropgrid.spec @@ -22,6 +22,7 @@ Patch1: %{name}-includedir.patch # Link only as required; not all libraries from wx-config are actually used Patch2: %{name}-linking.patch +BuildRequires: gcc BuildRequires: doxygen BuildRequires: wxGTK-devel From 6f59ce269c8e62aca57d9493a3c6ffa7f4c7b0fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:02:58 +0000 Subject: [PATCH 14/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wxpropgrid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxpropgrid.spec b/wxpropgrid.spec index 19a44c2..5f146af 100644 --- a/wxpropgrid.spec +++ b/wxpropgrid.spec @@ -3,7 +3,7 @@ Name: wxpropgrid Version: 1.4.15 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A property sheet control for wxWidgets Group: Applications/Engineering @@ -92,6 +92,9 @@ make install DESTDIR=%{buildroot} %{_includedir}/wx-2.8/wx/propgrid %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.4.15-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 1.4.15-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 5945dbd7acb11953bfbd2e56ab264575c9e81762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Mon, 23 Jul 2018 21:15:26 +0200 Subject: [PATCH 15/18] Add ccache BR --- wxpropgrid.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wxpropgrid.spec b/wxpropgrid.spec index 5f146af..9ad2efd 100644 --- a/wxpropgrid.spec +++ b/wxpropgrid.spec @@ -3,7 +3,7 @@ Name: wxpropgrid Version: 1.4.15 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A property sheet control for wxWidgets Group: Applications/Engineering @@ -22,6 +22,7 @@ Patch1: %{name}-includedir.patch # Link only as required; not all libraries from wx-config are actually used Patch2: %{name}-linking.patch +BuildRequires: ccache BuildRequires: gcc BuildRequires: doxygen BuildRequires: wxGTK-devel @@ -92,6 +93,9 @@ make install DESTDIR=%{buildroot} %{_includedir}/wx-2.8/wx/propgrid %changelog +* Mon Jul 23 2018 Volker Fröhlich - 1.4.15-15 +- Add ccache BR in the wake of gcc removal from buildroot + * Sat Jul 14 2018 Fedora Release Engineering - 1.4.15-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From c6474bf96e84d4c15dcf070009fc2dd44dc2c806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Mon, 23 Jul 2018 21:25:08 +0200 Subject: [PATCH 16/18] Replace BR ccache with gcc-c++ --- wxpropgrid.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wxpropgrid.spec b/wxpropgrid.spec index 9ad2efd..a52f8cf 100644 --- a/wxpropgrid.spec +++ b/wxpropgrid.spec @@ -22,8 +22,8 @@ Patch1: %{name}-includedir.patch # Link only as required; not all libraries from wx-config are actually used Patch2: %{name}-linking.patch -BuildRequires: ccache BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: doxygen BuildRequires: wxGTK-devel @@ -94,7 +94,7 @@ make install DESTDIR=%{buildroot} %changelog * Mon Jul 23 2018 Volker Fröhlich - 1.4.15-15 -- Add ccache BR in the wake of gcc removal from buildroot +- Add gcc-c++ BR in the wake of gcc removal from buildroot * Sat Jul 14 2018 Fedora Release Engineering - 1.4.15-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From e17e11b0ed65c01f88cafa4c07b7395a974baf69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Mon, 23 Jul 2018 21:45:37 +0200 Subject: [PATCH 17/18] BR gcc-c++ is enough --- wxpropgrid.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wxpropgrid.spec b/wxpropgrid.spec index a52f8cf..7b71ce1 100644 --- a/wxpropgrid.spec +++ b/wxpropgrid.spec @@ -3,7 +3,7 @@ Name: wxpropgrid Version: 1.4.15 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A property sheet control for wxWidgets Group: Applications/Engineering @@ -22,7 +22,6 @@ Patch1: %{name}-includedir.patch # Link only as required; not all libraries from wx-config are actually used Patch2: %{name}-linking.patch -BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: doxygen BuildRequires: wxGTK-devel @@ -93,6 +92,9 @@ make install DESTDIR=%{buildroot} %{_includedir}/wx-2.8/wx/propgrid %changelog +* Mon Jul 23 2018 Volker Fröhlich - 1.4.15-16 +- BR gcc-c++ is enough + * Mon Jul 23 2018 Volker Fröhlich - 1.4.15-15 - Add gcc-c++ BR in the wake of gcc removal from buildroot From 02af3270cb7ff9c2f5b0a303d23fe93664fe6e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Thu, 6 Dec 2018 22:29:48 +0100 Subject: [PATCH 18/18] wxWidgets 3.0 contains wxpropgrid and wxWidgets 2.8 is getting retired, see BZ#1620327 --- .gitignore | 1 - dead.package | 1 + sources | 1 - wxpropgrid-includedir.patch | 22 ------ wxpropgrid-linking.patch | 12 --- wxpropgrid-nosample.patch | 75 ------------------- wxpropgrid.spec | 141 ------------------------------------ 7 files changed, 1 insertion(+), 252 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 wxpropgrid-includedir.patch delete mode 100644 wxpropgrid-linking.patch delete mode 100644 wxpropgrid-nosample.patch delete mode 100644 wxpropgrid.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 04d9553..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/wxpropgrid-1.4.15-src.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a2daf86 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +wxWidgets 3.0 contains wxpropgrid and wxWidgets 2.8 is getting retired, see BZ#1620327 diff --git a/sources b/sources deleted file mode 100644 index de2eaf0..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -f44b5cd6fd60718bacfabbf7994f1e93 wxpropgrid-1.4.15-src.tar.gz diff --git a/wxpropgrid-includedir.patch b/wxpropgrid-includedir.patch deleted file mode 100644 index 96aa892..0000000 --- a/wxpropgrid-includedir.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nur propgrid/Makefile.in propgrid-includedir/Makefile.in ---- propgrid/Makefile.in 2011-02-27 09:26:00.000000000 +0100 -+++ propgrid-includedir/Makefile.in 2011-10-31 23:47:05.107250519 +0100 -@@ -258,13 +258,14 @@ - @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxcode_$(WX_PORT)$(WXLIBPOSTFIX)_propgrid-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__propgrid_dll___targetsuf3) - @COND_WX_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__propgrid_dll___so_symlinks_uninst_cmd)) - -+# Volker Fröhlich -+#Better use wx-config --version -+ - @COND_WX_SHARED_1@install_propgrid_dll_headers: - @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(prefix) -+@COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(prefix)/include/wx-2.8/wx/propgrid - @COND_WX_SHARED_1@ for f in $(PROPGRID_DLL_HEADERS); do \ --@COND_WX_SHARED_1@ if test ! -d $(DESTDIR)$(prefix)/`dirname $$f` ; then \ --@COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(prefix)/`dirname $$f`; \ --@COND_WX_SHARED_1@ fi; \ --@COND_WX_SHARED_1@ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(prefix)/$$f; \ -+@COND_WX_SHARED_1@ $(INSTALL_DATA) -p $(srcdir)/$$f $(DESTDIR)$(prefix)/include/wx-2.8/wx/propgrid/`basename $$f`; \ - @COND_WX_SHARED_1@ done - - @COND_WX_SHARED_1@uninstall_propgrid_dll_headers: diff --git a/wxpropgrid-linking.patch b/wxpropgrid-linking.patch deleted file mode 100644 index 040f5d7..0000000 --- a/wxpropgrid-linking.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur propgrid/Makefile.in propgrid-linking/Makefile.in ---- propgrid/Makefile.in 2011-02-27 09:26:00.000000000 +0100 -+++ propgrid-linking/Makefile.in 2011-12-13 00:49:58.631450204 +0100 -@@ -243,7 +243,7 @@ - @COND_WX_SHARED_0@ done - - @COND_WX_SHARED_1@$(srcdir)/lib/$(DLLPREFIX)wxcode_$(WX_PORT)$(WXLIBPOSTFIX)_propgrid-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__propgrid_dll___targetsuf3): $(PROPGRID_DLL_OBJECTS) --@COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(PROPGRID_DLL_OBJECTS) -L$(srcdir)/lib $(__propgrid_dll___macinstnamecmd) $(__propgrid_dll___importlib) $(__propgrid_dll___soname_flags) $(LDFLAGS) $(WX_LIBS) $(LIBS) -+@COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(PROPGRID_DLL_OBJECTS) -L$(srcdir)/lib $(__propgrid_dll___macinstnamecmd) $(__propgrid_dll___importlib) $(__propgrid_dll___soname_flags) -Wl,--as-needed $(LDFLAGS) $(WX_LIBS) $(LIBS) - @COND_WX_SHARED_1@ - @COND_WX_SHARED_1@ $(__propgrid_dll___so_symlinks_cmd) - diff --git a/wxpropgrid-nosample.patch b/wxpropgrid-nosample.patch deleted file mode 100644 index dd0a832..0000000 --- a/wxpropgrid-nosample.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- propgrid/Makefile.in 2011-02-27 09:26:00.000000000 +0100 -+++ propgrid-nosample/Makefile.in 2011-10-31 08:17:39.434048604 +0100 -@@ -93,13 +93,6 @@ - include/wx/propgrid/xh_propgrid.h - PROPGRIDSAMPLE_CXXFLAGS = -I$(srcdir)/include $(WX_CXXFLAGS) $(CPPFLAGS) \ - $(CXXFLAGS) --PROPGRIDSAMPLE_OBJECTS = \ -- propgridsample_minimal.o \ -- propgridsample_propgridsample.o \ -- propgridsample_sampleprops.o \ -- propgridsample_tests.o \ -- propgridsample_xh_propgrid.o \ -- $(__propgridsample___win32rc) - - ### Conditionally set variables: ### - -@@ -195,7 +188,7 @@ - - ### Targets: ### - --all: $(__propgrid_lib___depname) $(__propgrid_dll___depname) $(srcdir)/samples/propgridsample$(EXEEXT) -+all: $(__propgrid_lib___depname) $(__propgrid_dll___depname) - - install: $(__install_propgrid_lib___depname) $(__install_propgrid_lib_headers___depname) $(__install_propgrid_dll___depname) $(__install_propgrid_dll_headers___depname) - -@@ -211,7 +204,6 @@ - rm -f $(srcdir)/lib/$(DLLPREFIX)wxcode_$(WX_PORT)$(WXLIBPOSTFIX)_propgrid-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__propgrid_dll___targetsuf3) - rm -f $(srcdir)/lib/$(LIBPREFIX)wxcode_$(WX_PORT)$(WXLIBPOSTFIX)_propgrid-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) - rm -f $(srcdir)/lib/$(LIBPREFIX)wxcode_$(WX_PORT)$(WXLIBPOSTFIX)_propgrid-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(srcdir)/lib/$(DLLPREFIX)wxcode_$(WX_PORT)$(WXLIBPOSTFIX)_propgrid-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__propgrid_dll___targetsuf2) -- rm -f $(srcdir)/samples/propgridsample$(EXEEXT) - - distclean: clean - rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -@@ -272,15 +264,6 @@ - @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(prefix)/$$f; \ - @COND_WX_SHARED_1@ done - --$(srcdir)/samples/propgridsample$(EXEEXT): $(PROPGRIDSAMPLE_OBJECTS) make_sample_dir_propgridsample $(__propgridsample___win32rc) $(__propgrid_lib___depname) -- $(CXX) -o $@ $(PROPGRIDSAMPLE_OBJECTS) -L$(srcdir)/lib -L$(srcdir)/lib $(LDFLAGS_GUI) $(__propgridsample_RPATH) $(LDFLAGS) -lwxcode_$(WX_PORT)$(WXLIBPOSTFIX)_propgrid-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) $(LIBS) -- -- $(__propgridsample___mac_setfilecmd) -- $(__propgridsample___os2_emxbindcmd) -- --make_sample_dir_propgridsample: -- @mkdir -p $(srcdir)/samples -- - propgrid_lib_advprops.o: $(srcdir)/src/advprops.cpp - $(CXXC) -c -o $@ $(PROPGRID_LIB_CXXFLAGS) $(srcdir)/src/advprops.cpp - -@@ -323,25 +306,6 @@ - propgrid_dll_props.o: $(srcdir)/src/props.cpp - $(CXXC) -c -o $@ $(PROPGRID_DLL_CXXFLAGS) $(srcdir)/src/props.cpp - --propgridsample_minimal.o: $(srcdir)/samples/minimal.cpp -- $(CXXC) -c -o $@ $(PROPGRIDSAMPLE_CXXFLAGS) $(srcdir)/samples/minimal.cpp -- --propgridsample_propgridsample.o: $(srcdir)/samples/propgridsample.cpp -- $(CXXC) -c -o $@ $(PROPGRIDSAMPLE_CXXFLAGS) $(srcdir)/samples/propgridsample.cpp -- --propgridsample_sampleprops.o: $(srcdir)/samples/sampleprops.cpp -- $(CXXC) -c -o $@ $(PROPGRIDSAMPLE_CXXFLAGS) $(srcdir)/samples/sampleprops.cpp -- --propgridsample_tests.o: $(srcdir)/samples/tests.cpp -- $(CXXC) -c -o $@ $(PROPGRIDSAMPLE_CXXFLAGS) $(srcdir)/samples/tests.cpp -- --propgridsample_xh_propgrid.o: $(srcdir)/src/xh_propgrid.cpp -- $(CXXC) -c -o $@ $(PROPGRIDSAMPLE_CXXFLAGS) $(srcdir)/src/xh_propgrid.cpp -- --propgridsample_sample_rc.o: $(srcdir)/samples/sample.rc -- $(WX_RESCOMP) -i$< -o$@ --include-dir $(srcdir)/include --include-dir $(srcdir)/samples -- -- - # Include dependency info, if present: - @IF_GNU_MAKE@-include ./.deps/*.d - diff --git a/wxpropgrid.spec b/wxpropgrid.spec deleted file mode 100644 index 7b71ce1..0000000 --- a/wxpropgrid.spec +++ /dev/null @@ -1,141 +0,0 @@ -# Notice: wxpropgrid is part of wx 2.9 and will become obsolete -# https://code.ros.org/trac/ros-pkg/ticket/5154 - -Name: wxpropgrid -Version: 1.4.15 -Release: 16%{?dist} -Summary: A property sheet control for wxWidgets - -Group: Applications/Engineering -License: wxWidgets -URL: http://wxpropgrid.sourceforge.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz - -# Don't build samples -Patch0: %{name}-nosample.patch - -# Use the system-wide wx include directory and preserve timestamp -# https://sourceforge.net/tracker/?func=detail&aid=3453329&group_id=133406&atid=727081 -#TODO: Is this path specific to Fedora? -Patch1: %{name}-includedir.patch - -# Link only as required; not all libraries from wx-config are actually used -Patch2: %{name}-linking.patch - -BuildRequires: gcc-c++ -BuildRequires: doxygen -BuildRequires: wxGTK-devel - -%description -wxPropertyGrid is a property sheet control for wxWidgets. In other -words, it is a specialized two-column grid for editing properties -such as strings, numbers, flagsets, string arrays, and colors. - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. - - -%prep -%setup -q -n propgrid - -# Correct encoding and line ends -iconv -f iso8859-1 -t utf-8 CHANGES.txt > CHANGES.txt.conv && mv CHANGES.txt.conv CHANGES.txt -sed -i 's/\r//' CHANGES.txt samples/sample.xrc samples/sample.rc - -%patch0 -p1 -b .nosample~ -%patch1 -p1 -b .includedir~ -%patch2 -p1 -b .linking~ - -# Solve the stall with Doxygen 1.7.6 in Rawhide -# Doxygen 1.7.6.1 has a patch "to fix the hang -# issue when non-empty INCLUDE_PATH was used" -sed -i 's/^SEARCH_INCLUDES.*/SEARCH_INCLUDES = NO/' docs/Doxyfile - - -%build -%configure - -make %{?_smp_mflags} - -# Create up-to-date documentation -pushd docs - doxygen -u - doxygen -popd - -rm -f docs/html/installdox - -%install -make install DESTDIR=%{buildroot} - - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - - -%files -# Upstream ships no license file -# https://sourceforge.net/tracker/?func=detail&aid=3453325&group_id=133406&atid=727081 -%doc CHANGES.txt -%{_libdir}/libwxcode_gtk2u_propgrid-2.8.so.* - -%files devel -%doc samples docs/html -%{_libdir}/libwxcode_gtk2u_propgrid-2.8.so -%{_includedir}/wx-2.8/wx/propgrid - -%changelog -* Mon Jul 23 2018 Volker Fröhlich - 1.4.15-16 -- BR gcc-c++ is enough - -* Mon Jul 23 2018 Volker Fröhlich - 1.4.15-15 -- Add gcc-c++ BR in the wake of gcc removal from buildroot - -* Sat Jul 14 2018 Fedora Release Engineering - 1.4.15-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.4.15-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.4.15-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.4.15-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.4.15-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1.4.15-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.4.15-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 1.4.15-7 -- Rebuilt for GCC 5 C++11 ABI change - -* Mon Aug 18 2014 Fedora Release Engineering - 1.4.15-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.4.15-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 1.4.15-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 1.4.15-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 1.4.15-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Dec 13 2011 Volker Fröhlich - 1.4.15-1 -- Initial package