Remove "release" suffix from wx-config links used in RPMs.

We don't distinguish debug and release builds under Unix any more in 2.9 and
don't use "release" and "debug" suffixes in full wx-config names. Remove these
suffixes from the wx-config links created by RPM post-installation step.

See #12567.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxGTK.spec b/wxGTK.spec
index 82379d28bb7dcf7df38f941997eadceccf3ec3b3..971fb1e74ad3ea59cac6d48860de77989d583541 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -29,23 +29,23 @@
 
 %if %{unicode}
     %define name               wx-%{portname}-unicode
-    %define wxconfig           %{portname}-unicode-release-%{ver2}
-    %define wxconfigstatic     %{portname}-unicode-release-static-%{ver2}
+    %define wxconfig           %{portname}-unicode-%{ver2}
+    %define wxconfigstatic     %{portname}-unicode-static-%{ver2}
     %define wxconfiglink       wx%{portname}u-%{ver2}-config
 %else
     %define name               wx-%{portname}-ansi
-    %define wxconfig           %{portname}-ansi-release-%{ver2}
-    %define wxconfigstatic     %{portname}-ansi-release-static-%{ver2}
+    %define wxconfig           %{portname}-ansi-%{ver2}
+    %define wxconfigstatic     %{portname}-ansi-static-%{ver2}
     %define wxconfiglink       wx%{portname}-%{ver2}-config
 %endif
 
 %if %{unicode}
     %define wxbasename         wx-base-unicode
-    %define wxbaseconfig       base-unicode-release-%{ver2}
+    %define wxbaseconfig       base-unicode-%{ver2}
     %define wxbaseconfiglink   wxbaseu-%{ver2}-config
 %else
     %define wxbasename         wx-base-ansi
-    %define wxbaseconfig       base-ansi-release-%{ver2}
+    %define wxbaseconfig       base-ansi-%{ver2}
     %define wxbaseconfiglink   wxbase-%{ver2}-config
 %endif
 

diff --git a/wxMotif.spec b/wxMotif.spec
index 294dc730fdc671f680505e5534f5657eaca43cb1..4027cc57579f910e27aa3daac9dff0215240f0c1 100644 (file)
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -7,7 +7,7 @@
 %define name       wx-%{portname}
 %define wxbasename wx-base
 
-%define wxconfig     %{portname}-ansi-release-%{ver2}
+%define wxconfig     %{portname}-ansi-%{ver2}
 %define wxconfiglink wx%{portname}-%{ver2}-config
 
 Summary: The Motif/Lesstif port of the wxWidgets library

diff --git a/wxX11.spec b/wxX11.spec
index dfa1ccb2d1abbd3d34bc332068a821dbc9d3b91a..87bda6d2a45a8cb4ff158d4bfb590c72852db917 100644 (file)
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -13,12 +13,12 @@
 %if %{unicode}
     %define wxbasename   wx-base-unicode
     %define name         wx-%{portname}-unicode
-    %define wxconfig     %{portname}-unicode-release-%{ver2}
+    %define wxconfig     %{portname}-unicode-%{ver2}
     %define wxconfiglink wx%{portname}u-%{ver2}-config
 %else
     %define wxbasename   wx-base
     %define name         wx-%{portname}
-    %define wxconfig     %{portname}-ansi-release-%{ver2}
+    %define wxconfig     %{portname}-ansi-%{ver2}
     %define wxconfiglink wx%{portname}-%{ver2}-config
 %endif