commit 830cf461624dbcd9767dc7e2484bcfdb8624655c
Author: Jakub Bogusz <[email protected]>
Date: Tue Jan 21 16:22:53 2014 +0100
- more install time dependensies
- ldconfig for wxGTK3* packages
- (in previous commits) verbose libraries list to track them and avoid
missing on updates
wxWidgets.spec | 44 +++++++++++++++++++++++++++++++++++---------
1 file changed, 35 insertions(+), 9 deletions(-)
---
diff --git a/wxWidgets.spec b/wxWidgets.spec
index a238256..2787c50 100644
--- a/wxWidgets.spec
+++ b/wxWidgets.spec
@@ -158,6 +158,7 @@ Summary: wxBase library - non-GUI support classes of
wxWidgets toolkit
Summary(pl.UTF-8): wxBase - biblioteka klas wxWidgets nie związanych z GUI
Group: X11/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: zlib >= 1.1.4
%description -n wxBase
wxBase is a collection of C++ classes providing basic data structures
@@ -197,6 +198,7 @@ Summary: wxBase library - non-GUI support classes of
wxWidgets toolkit with UNIC
Summary(pl.UTF-8): wxBase - biblioteka klas wxWidgets nie związanych z GUI
ze wsparciem dla UNICODE
Group: X11/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: zlib >= 1.1.4
%description -n wxBase-unicode
wxBase is a collection of C++ classes providing basic data structures
@@ -238,6 +240,8 @@ Summary(pl.UTF-8): Biblioteka wxGTK2
Group: X11/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gtk+2 >= 2:2.10
+Requires: gtk-webkit >= 1.3.1
+Requires: wxBase = %{version}-%{release}
Obsoletes: wxGTK2-univ
%description -n wxGTK2
@@ -293,6 +297,9 @@ Summary: wxGTK2 library with UNICODE support
Summary(pl.UTF-8): Biblioteka wxGTK2 z obsługą UNICODE
Group: X11/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: wxBase-unicode = %{version}-%{release}
+Requires: gtk+2 >= 2:2.10
+Requires: gtk-webkit >= 1.3.1
Obsoletes: wxGTK2-univ-unicode
%description -n wxGTK2-unicode
@@ -351,7 +358,8 @@ Summary: wxGTK3 library
Summary(pl.UTF-8): Biblioteka wxGTK3
Group: X11/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: gtk+2 >= 2:2.10
+Requires: gtk-webkit3 >= 1.3.1
+Requires: wxBase = %{version}-%{release}
Obsoletes: wxGTK3-univ
%description -n wxGTK3
@@ -407,6 +415,8 @@ Summary: wxGTK3 library with UNICODE support
Summary(pl.UTF-8): Biblioteka wxGTK3 z obsługą UNICODE
Group: X11/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: gtk-webkit3 >= 1.3.1
+Requires: wxBase-unicode = %{version}-%{release}
Obsoletes: wxGTK3-univ-unicode
%description -n wxGTK3-unicode
@@ -478,6 +488,7 @@ Summary: wxUniversal-based wxX11 library
Summary(pl.UTF-8): Oparta na wxUniversal biblioteka wxX11
Group: X11/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: wxBase = %{version}-%{release}
Obsoletes: wxX11-univ
%description -n wxX11
@@ -491,6 +502,7 @@ Summary: Header files for wxUniversal-based wxX11 library
Summary(pl.UTF-8): Pliki nagłówkowe opartej na wxUniversal biblioteki wxX11
Group: X11/Libraries
Requires: %{name}-devel = %{version}-%{release}
+Requires: wxBase-devel = %{version}-%{release}
Requires: wxX11 = %{version}-%{release}
Obsoletes: wxX11-univ-devel
@@ -533,6 +545,7 @@ Summary: wxUniversal-based wxX11 library with UNICODE
support
Summary(pl.UTF-8): Oparta na wxUniversal biblioteka wxX11 z obsługą UNICODE
Group: X11/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: wxBase-unicode = %{version}-%{release}
Obsoletes: wxX11-univ-unicode
%description -n wxX11-unicode
@@ -546,6 +559,7 @@ Summary: Header files for wxUniversal-based wxX11
library with UNICODE support
Summary(pl.UTF-8): Pliki nagłówkowe opartej na wxUniversal biblioteki
wxX11 z obsługą UNICODE
Group: X11/Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
+Requires: wxBase-unicode-devel = %{version}-%{release}
Requires: wxX11-unicode = %{version}-%{release}
Obsoletes: wxX11-univ-unicode-devel
@@ -743,28 +757,40 @@ cp -f docs/x11/readme.txt docs/wxX11-readme.txt
rm -rf $RPM_BUILD_ROOT
%post -n wxBase -p /sbin/ldconfig
-%postun -n wxBase -p /sbin/ldconfig
+%postun -n wxBase -p /sbin/ldconfig
%post -n wxBase-unicode -p /sbin/ldconfig
-%postun -n wxBase-unicode -p /sbin/ldconfig
+%postun -n wxBase-unicode -p /sbin/ldconfig
%post -n wxGTK2 -p /sbin/ldconfig
-%postun -n wxGTK2 -p /sbin/ldconfig
+%postun -n wxGTK2 -p /sbin/ldconfig
%post -n wxGTK2-gl -p /sbin/ldconfig
-%postun -n wxGTK2-gl -p /sbin/ldconfig
+%postun -n wxGTK2-gl -p /sbin/ldconfig
%post -n wxGTK2-unicode -p /sbin/ldconfig
-%postun -n wxGTK2-unicode -p /sbin/ldconfig
+%postun -n wxGTK2-unicode -p /sbin/ldconfig
%post -n wxGTK2-unicode-gl -p /sbin/ldconfig
-%postun -n wxGTK2-unicode-gl -p /sbin/ldconfig
+%postun -n wxGTK2-unicode-gl -p /sbin/ldconfig
+
+%post -n wxGTK3 -p /sbin/ldconfig
+%postun -n wxGTK3 -p /sbin/ldconfig
+
+%post -n wxGTK3-gl -p /sbin/ldconfig
+%postun -n wxGTK3-gl -p /sbin/ldconfig
+
+%post -n wxGTK3-unicode -p /sbin/ldconfig
+%postun -n wxGTK3-unicode -p /sbin/ldconfig
+
+%post -n wxGTK3-unicode-gl -p /sbin/ldconfig
+%postun -n wxGTK3-unicode-gl -p /sbin/ldconfig
%post -n wxX11 -p /sbin/ldconfig
-%postun -n wxX11 -p /sbin/ldconfig
+%postun -n wxX11 -p /sbin/ldconfig
%post -n wxX11-unicode -p /sbin/ldconfig
-%postun -n wxX11-unicode -p /sbin/ldconfig
+%postun -n wxX11-unicode -p /sbin/ldconfig
%define libflag %{?with_debug:d}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wxWidgets.git/commitdiff/830cf461624dbcd9767dc7e2484bcfdb8624655c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
