|
@@ -8,12 +8,12 @@ Summary: Qt toolkit
|
|
|
Summary(ja): Qt ツールキット
|
|
|
Name: qt4
|
|
|
Version: 4.8.6
|
|
|
-Release: 3%{?_dist_release}
|
|
|
+Release: 4%{?_dist_release}
|
|
|
|
|
|
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
|
|
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
|
|
|
Group: System Environment/Libraries
|
|
|
-URL: http://qt.nokia.com/
|
|
|
+URL: http://qt-project.org/
|
|
|
|
|
|
Source0: http://download.qt-project.org/official_releases/qt/4.8/%{version}/qt-%{type}-%{version}.tar.gz
|
|
|
|
|
@@ -786,9 +786,9 @@ rm -f $RPM_BUILD_ROOT%{_qt4_examplesdir}/examples-manifest.xml
|
|
|
%clean
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
+%pre
|
|
|
# If %{_libdir}/qt4 is symbolic link, remove it
|
|
|
# Is this safe?
|
|
|
-%pre
|
|
|
if [ $1 -eq 2 -a -L %{_libdir}/qt4 ] ; then
|
|
|
rm -f %{_libdir}/qt4 &> /dev/null ||:
|
|
|
fi
|
|
@@ -807,7 +807,6 @@ if [ $1 -eq 0 ] ; then
|
|
|
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
|
|
|
fi
|
|
|
|
|
|
-# config
|
|
|
%post config
|
|
|
/sbin/update-alternatives --install \
|
|
|
%{_bindir}/qtconfig qtconfig %{_qt4_bindir}/qtconfig 20
|
|
@@ -821,10 +820,8 @@ fi
|
|
|
%postun config
|
|
|
if [ $1 -eq 0 ] ; then
|
|
|
/sbin/update-alternatives --remove qtconfig %{_qt4_bindir}/qtconfig
|
|
|
- /sbin/update-alternatives --auto qtconfig
|
|
|
fi
|
|
|
|
|
|
-# designer
|
|
|
%post designer
|
|
|
touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
|
|
|
/sbin/update-alternatives --install \
|
|
@@ -841,12 +838,9 @@ fi
|
|
|
if [ $1 -eq 0 ] ; then
|
|
|
touch --no-create %{_datadir}/icons/hicolor &> /dev/null ||:
|
|
|
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null ||:
|
|
|
- /sbin/update-alternatives --remove designer %{_qt4_bindir}/desiner
|
|
|
- /sbin/update-alternatives --auto designer
|
|
|
+ /sbin/update-alternatives --remove designer %{_qt4_bindir}/designer
|
|
|
fi
|
|
|
|
|
|
-
|
|
|
-# devel
|
|
|
%post devel
|
|
|
/sbin/update-alternatives --install \
|
|
|
%{_bindir}/qmake qmake %{_qt4_bindir}/qmake 20 \
|
|
@@ -872,7 +866,6 @@ fi
|
|
|
%postun devel
|
|
|
if [ $1 -eq 0 ] ; then
|
|
|
/sbin/update-alternatives --remove qmake %{_qt4_bindir}/qmake
|
|
|
- /sbin/update-alternatives --auto qmake
|
|
|
fi
|
|
|
|
|
|
%post tools
|
|
@@ -894,14 +887,11 @@ fi
|
|
|
if [ $1 -eq 0 ] ; then
|
|
|
/sbin/update-alternatives --remove assistant %{_qt4_bindir}/assistant
|
|
|
/sbin/update-alternatives --remove linguist %{_qt4_bindir}/linguist
|
|
|
- /sbin/update-alternatives --auto assistant
|
|
|
- /sbin/update-alternatives --auto linguist
|
|
|
fi
|
|
|
|
|
|
-
|
|
|
+%pre -n compat32-%{name}
|
|
|
# If %{_libdir}/qt4 is symbolic link, remove it
|
|
|
# Is this safe?
|
|
|
-%pre -n compat32-%{name}
|
|
|
if [ $1 -eq 2 -a -L %{_libdir}/qt4 ] ; then
|
|
|
rm -f %{_libdir}/qt4 &> /dev/null ||:
|
|
|
fi
|
|
@@ -1139,6 +1129,12 @@ fi
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Feb 2 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.8.6-4
|
|
|
+- fixed typo in %%postun of designer subpackage
|
|
|
+- removed /sbin/update-alternative --auto from %%postun
|
|
|
+- updated SOURCE22 for Icon path
|
|
|
+- updated URL
|
|
|
+
|
|
|
* Sun Feb 1 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.8.6-3
|
|
|
- updated Source20, 21, 22 and 23
|
|
|
- added Patch25, 50, 83, 84, 86, 87, 88, 89 and 102 from Fedora
|