- updated URL

[packages/wxWidgets.git] / wxWidgets.spec

diff --git a/wxWidgets.spec b/wxWidgets.spec
index 55d5734910778d03781a32b52008fad16af86c63..a9eedf2e0045b80db15e795bc78f8466d0c16dd6 100644 (file)
--- a/wxWidgets.spec
+++ b/wxWidgets.spec
@@ -17,6 +17,7 @@ Version:      3.2.2.1
 Release:       2
 License:       wxWindows Library Licence 3.1 (LGPL v2+ with exception)
 Group:         X11/Libraries
+#Source0Download: https://github.com/wxWidgets/wxWidgets/releases
 Source0:       https://github.com/wxWidgets/wxWidgets/releases/download/v%{version}/%{name}-%{version}.tar.bz2
 # Source0-md5: 45bd5f56a06e7c4ca7caf6c0b4d5d506
 Patch0:                %{name}-samples.patch
@@ -25,7 +26,7 @@ Patch2:               %{name}-gifdelay.patch
 Patch3:                relax-abicheck.patch
 Patch4:                os-release.patch
 Patch5:                webkit2gtk4.1.patch
-URL:           http://www.wxWidgets.org/
+URL:           https://www.wxWidgets.org/
 %{?with_directfb:BuildRequires:        DirectFB-devel >= 0.9.23}
 %{?with_gtk3:BuildRequires:    EGL-devel >= 1.5}
 BuildRequires: OpenGL-GLU-devel
@@ -104,11 +105,11 @@ Obsoletes:        wxMotif-gl-devel < %{version}-%{release}
 %endif
 Obsoletes:     wxWidgets-HelpGen < 3
 Obsoletes:     wxWidgets-afm < 2.6
-Obsoletes:     wxWindows
-Obsoletes:     wxWindows-HelpGen
-Obsoletes:     wxWindows-afm
-Obsoletes:     wxwin-afm
-Obsoletes:     wxwin-common
+Obsoletes:     wxWindows < 2.5
+Obsoletes:     wxWindows-HelpGen < 2.5
+Obsoletes:     wxWindows-afm < 2.5
+Obsoletes:     wxwin-afm < 2.5
+Obsoletes:     wxwin-common < 2.5
 Conflicts:     wxGTK2 < 2.6.0
 Conflicts:     wxGTK2-unicode < 2.6.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -135,7 +136,7 @@ Summary:    wxWidgets header files and development documentation
 Summary(pl.UTF-8):     Pliki nagłówkowe i dokumentacja do wxWidgets
 Group:         X11/Development/Libraries
 Requires:      libstdc++-devel
-Obsoletes:     wxWindows-devel
+Obsoletes:     wxWindows-devel < 2.5
 
 %description devel
 Header files and development documentation for the wxWidgets
@@ -162,7 +163,7 @@ Summary:    wxWidgets example programs
 Summary(pl.UTF-8):     Przykładowe programy wxWidgets
 Group:         X11/Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
-Obsoletes:     wxWindows-examples
+Obsoletes:     wxWindows-examples < 2.5
 BuildArch:     noarch
 
 %description examples
@@ -651,7 +652,7 @@ Summary:    Misc utils from wxWidgets project
 Summary(pl.UTF-8):     Różne narzędzia z projektu wxWidgets
 Group:         X11/Development/Tools
 Requires:      wxX11-unicode = %{version}-%{release}
-Obsoletes:     wxWindows-utils
+Obsoletes:     wxWindows-utils < 2.5
 
 %description utils
 Misc utils from wxWidgets project: wxemulator, wxrc, etc.
@@ -864,13 +865,7 @@ for gui in %{?with_gtk2:'--with-gtk=2'} %{?with_gtk3:'--with-gtk=3'} %{?with_mot
 for unicode in %{?with_ansi:'--disable-unicode'} '--enable-unicode' ; do
        objdir=`echo obj${gui}${unicode}|sed 's/ /_/g'`
        %{__make} -C $objdir install \
-               prefix=$RPM_BUILD_ROOT%{_prefix} \
-               exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-               bindir=$RPM_BUILD_ROOT%{_bindir} \
-               datadir=$RPM_BUILD_ROOT%{_datadir} \
-               libdir=$RPM_BUILD_ROOT%{_libdir} \
-               mandir=$RPM_BUILD_ROOT%{_mandir} \
-               includedir=$RPM_BUILD_ROOT%{_includedir} \
+               DESTDIR=$RPM_BUILD_ROOT \
                LOCALE_MSW_LINGUAS=
 done
 done
@@ -881,13 +876,7 @@ for unicode in %{?with_ansi:'--disable-unicode'} '--enable-unicode' ; do
        objdir=`echo obj${gui}${unicode}|sed 's/ /_/g'`
        cd $objdir
        %{__make} install \
-               prefix=$RPM_BUILD_ROOT%{_prefix} \
-               exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-               bindir=$RPM_BUILD_ROOT%{_bindir} \
-               datadir=$RPM_BUILD_ROOT%{_datadir} \
-               libdir=$RPM_BUILD_ROOT%{_libdir} \
-               mandir=$RPM_BUILD_ROOT%{_mandir} \
-               includedir=$RPM_BUILD_ROOT%{_includedir} \
+               DESTDIR=$RPM_BUILD_ROOT \
                LOCALE_MSW_LINGUAS=
        if echo $objdir| grep -q 'with-x11--enable-unicode' ; then
                # TODO: install default config files and default backgrouds