update: kdebase3, kuftp, qtscriptgenerator, gscintilla

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

k/kdebase3/kdebase3-vl.spec

@@ -6,9 +6,9 @@
 
 Name: kdebase3
 Version: 3.5.10
-Release: 1%{?_dist_release}
-Summary: K Desktop Environment 3 - core files
-Summary(ja): K デスクトップ環境 3 - 基本ファイル
+Release: 2%{?_dist_release}
+Summary: KDE 3 core files
+Summary(ja): KDE 3 基本ファイル
 URL: http://www.kde.org/
 Group: User Interface/Desktops
 License: GPLv2
@@ -83,6 +83,7 @@ BuildRequires: automake libtool
 BuildRequires: pkgconfig
 BuildRequires: doxygen
 
+BuildRequires: arts-devel
 BuildRequires: dbus-devel dbus-qt3-devel hal-devel
 BuildRequires: bzip2-devel
 BuildRequires: freetype2-devel
@@ -146,6 +147,7 @@ Core runtime files for KDE 3, for compatibility with KDE 3 applications.
 
 %package devel
 Summary: Development files for %{name}
+Summary(ja): %{name} の開発用ファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: kdelibs3-devel
@@ -464,6 +466,9 @@ fi
 %exclude %{_libdir}/libkdeinit_*.so
 
 %changelog
+* Sun Mar 13 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-2
+- rebuilt with openssl-1.0.0d
+
 * Sun Mar 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-1
 - updated to 3.5.10 based on FC
 - removed the static cdparanoia hack

k/kuftp/kuftp-vl.spec

@@ -1,13 +1,16 @@
 Name:		kuftp
 Version:	1.5.0
-Summary:        A graphical FTP client for the K Desktop Environment
-Summary(ja):	K デスクトップ環境用のグラフィカルな FTP クライアント
-Release:	4%{?_dist_release}
+Summary:        A graphical FTP client for KDE
+Summary(ja):	KDE 3 のグラフィカルな FTP クライアント
+Release:	5%{?_dist_release}
+
 License:	GPLv2+
-Url:	        http://kuftp.sourceforge.net/	
+URL:	        http://kuftp.sourceforge.net/	
 Group:		Applications/Internet
+
 Source0:	%{name}-%{version}.tar.bz2
 Source1:	%{name}.mo
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	kdelibs3-devel
 BuildRequires:	openssl-devel
@@ -16,7 +19,7 @@ Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
       
 %description
-KuFTP is a graphical FTP client for the K Desktop Environment.
+KuFTP is a graphical FTP client for KDE.
 
 Most notable features is Tab Sessions like Konqueror or Firefox.
 Other features like bookmark manager,queue manager,speed limit,
@@ -24,7 +27,7 @@ proxy support, SSL/TSL support, multi charsets support and some
 small nifty features are currently available in the latest version.
 
 %description -l ja
-KuFTP は K デスクトップ環境用のグラフィカルな FTP クライアントです。
+KuFTP は KDE 用のグラフィカルな FTP クライアントです。
 
 最大の特徴は、Konqueror または Firefox のようなタブ・セッションズです。
 ブックマークマネージャー、キュー・マネージャー、速度制限、
@@ -44,11 +47,11 @@ KuFTP は K デスクトップ環境用のグラフィカルな FTP クライア
 make %{?_smp_mflags}
 
 %install
-rm -rf %buildroot
+rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
-mkdir -p %buildroot%{_localedir}/ja/LC_MESSAGES
-install -m 644 %{SOURCE1} %buildroot%{_localedir}/ja/LC_MESSAGES/%{name}.mo
+mkdir -p $RPM_BUILD_ROOT%{_localedir}/ja/LC_MESSAGES
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_localedir}/ja/LC_MESSAGES/%{name}.mo
 
 # changed .desktop file location
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/kde
@@ -87,6 +90,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 %{_datadir}/icons/hicolor/*/apps/kuftp.png
 
 %changelog
+* Sun Mar 13 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.5.0-5
+- rebuilt with openssl-1.0.0d
+
 * Fri Apr 16 2010 Shu KONNO <owa@bg.wakwak.com> 1.5.0-4
 - added --with-qt-libraries to configure
 

q/qscintilla/qscintilla-vl.spec

@@ -3,20 +3,20 @@
 
 %define ver 1.78
 
-%define qt4_ver 4.7.1
-%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
+%define _qt4_version 4.7.2
+%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{_qt4_version})
 %define _qt4_libdir %(pkg-config --variable libdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/lib)
 %define _qt4_includedir %(pkg-config --variable headerdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/include)
 %define _qt4_translationdir %(pkg-config --variable translationdir --silence-errors Qt 2>/dev/null || echo %{_datadir}/qt4/translations)
 
-%global qtdir %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
+%global qtdir %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_version})
 %global qtinc	%{qtdir}/include
 %global qtlib	%{qtdir}/lib
 
 Summary:	A Scintilla port to Qt
 Name:		qscintilla
 Version:	2.4.6
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 
 # matches up (pretty much) with qt4
 License:	GPLv3 or GPLv2 with exceptions
@@ -28,8 +28,9 @@ Source:		QScintilla-gpl-%{version}.tar.gz
 Patch1:         QScintilla-2-gpl-Qt4-incpath.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	qt4-devel = %{qt4_ver}
+BuildRequires:	qt4-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version} 
+Requires:	qt4 = %{_qt4_version}
 
 %description
 QScintilla is a port of Scintilla to the Qt GUI toolkit.
@@ -49,7 +50,7 @@ Requires: qt4-designer
 Summary: QScintilla Development Files
 Group: Development/Libraries
 Requires: %{name} = %{version}
-Requires: qt4-devel
+Requires: qt4-devel = %{_qt4_version}
 
 %description  devel
 This packages contains the libraries, include and other files
@@ -151,6 +152,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/sip/PyQt4/Qsci
 
 %changelog
+* Sun Mar 13 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.4.6-2
+- rebuilt with qt-4.7.2
+
 * Sun Feb 20 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.4.6-1
 - new upstream release
 - fix qt4_ver from 4.6.3 to 4.7.1

q/qtscriptgenerator/qtscriptgenerator-vl.spec

@@ -1,4 +1,4 @@
-%define qt4_ver 4.6.3
+%define qt4_ver 4.7.2
 # Qt4 version auto-detection
 %define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo %{qt4_ver})
 %define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
@@ -10,7 +10,7 @@
 Name:		qtscriptgenerator
 Summary: 	A tool to generate Qt bindings for Qt Script	
 Version:	0.1.0
-Release:	13%{?_dist_release}
+Release:	14%{?_dist_release}
 
 Group:		System Environment/Libraries
 License: 	GPLv2	
@@ -18,9 +18,11 @@ URL:		http://code.google.com/p/qtscriptgenerator/
 Source0:	http://qtscriptgenerator.googlecode.com/files/qtscriptgenerator-src-%{version}.tar.gz	
 
 Patch1: qtscriptgenerator-0.1.0-gcc44.patch
+Patch2: qtscriptgenerator-src-0.1.0-no_phonon.patch
+
 ## upstreamable patches
 Patch50: qtscriptgenerator-src-0.1.0-qmake_target.path.patch
-Patch51: qtscriptgenerator-kde_phonon.patch
+Patch51: qtscriptgenerator-kde_phonon443.patch
 ## debian patches
 Patch60: memory_alignment_fix.diff
 
@@ -56,6 +58,7 @@ from within Qt Script.
 %setup -q -n %{name}-src-%{version}
 
 %patch1 -p0 -b .gcc44
+%patch2 -p1 -b .no_phonon
 %patch50 -p1 -b .qmake_target.path
 %patch51 -p1 -b .kde_phonon
 
@@ -118,6 +121,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Mar 13 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.1.0-14
+- rebuilt with qt-4.7.2
+- added Patch1
+
 * Sun Oct 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.1.0-13
 - initial build for Vine Linux