2015-02-03 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* qt, qt4: fixed spec
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9326 ec354946-7b23-47d6-9f5a-488ba84defc7

q/qt/qt-vl.spec

@@ -1,6 +1,6 @@
 %define type x11
 %define qtdir %{_libdir}/qt-%{version}
-%define rel 17
+%define rel 18
 %define buildstatic 1
 %define buildnonthread 0
 %define styleplugins 0
@@ -25,9 +25,9 @@ Release: %{rel}%{?_dist_release}
 
 License: GPL/QPL
 Group: System Environment/Libraries
-URL: http://www.qtsoftware.com/
+URL: http://qt-project.org/
 
-Source: ftp://ftp.qtsoftware.com/qt/source/qt-%{type}-free-%{version}.tar.bz2
+Source0: http://download.qt.io/archive/qt/3/qt-%{type}-free-%{version}.tar.bz2
 # Patches -99 are from kde.org
 Patch0: uic-patch.diff
 
@@ -57,7 +57,6 @@ Patch801: qt-x11-free-3.3.8-gcc46.patch
 Patch802: qt-x11-free-3.3.8-freetype-2.5.x.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-Prefix: %{qtdir}
 #BuildRequires: openMotif-devel >= 2.2.2
 BuildRequires: libmng-devel
 BuildRequires: glibc-devel
@@ -96,6 +95,7 @@ BuildRequires: unixODBC-devel
 #Requires: libexpat libstdc++34
 #Requires: libpng >= 1.2.5
 #Requires: freetype2 libjpeg libmng zlib
+Prefix: %{qtdir}
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -215,6 +215,7 @@ for the Qt toolkit.
 # compat32
 %package -n compat32-%{name}
 Summary: The shared library for the Qt GUI toolkit.
+Summary(ja): Qt ツールキット
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 
@@ -230,6 +231,7 @@ applications, as well as the README files for qt.
 
 %package -n compat32-%{name}-devel
 Summary: Development files and documentation for the Qt GUI toolkit.
+Summary(ja): Qt ツールキットの開発用ファイル
 Group: Development/Libraries
 Requires: %{name}-devel = %{version}-%{release}
 Requires: compat32-%{name} = %{version}-%{release}
@@ -573,11 +575,8 @@ fi
 %postun devel
 if [ $1 -eq 0 ] ; then
     /sbin/update-alternatives --remove assistant %{qtdir}/bin/assistant
-    /sbin/update-alternatives --remove qtconfig %{_qtdir}/bin/qtconfig
-    /sbin/update-alternatives --remove qmake %{_qtdir}/bin/qmake
-    /sbin/update-alternatives --auto assistant
-    /sbin/update-alternatives --auto qtconfig
-    /sbin/update-alternatives --auto qmake
+    /sbin/update-alternatives --remove qtconfig %{qtdir}/bin/qtconfig
+    /sbin/update-alternatives --remove qmake %{qtdir}/bin/qmake
 fi
 
 %post designer
@@ -598,9 +597,7 @@ fi
 %postun designer
 if [ $1 -eq 0 ] ; then
     /sbin/update-alternatives --remove designer %{qtdir}/bin/designer
-    /sbin/update-alternatives --remove linguist %{_qtdir}/bin/linguist
-    /sbin/update-alternatives --auto designer
-    /sbin/update-alternatives --auto linguist
+    /sbin/update-alternatives --remove linguist %{qtdir}/bin/linguist
 fi
 
 %post -n compat32-%{name} -p /sbin/ldconfig
@@ -758,6 +755,10 @@ fi
 %endif
 
 %changelog
+* Mon Feb  2 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.3.8-18
+- fixed %%postun script (devel, designer)
+- updated URL and Source0
+
 * Sat Jul 12 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.3.8-17
 - rebuild with VineSeed environment
 - change BuildRequires: libjpeg-turbo-devel instead of libjpeg-devel

q/qt4/qt4-vl.spec

@@ -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