Browse Source

update: qscintilla, libktorrent

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2725 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 14 years ago
parent
commit
e2f5264032
2 changed files with 20 additions and 11 deletions
  1. 10 7
      lib/libk/libktorrent/libktorrent-vl.spec
  2. 10 4
      q/qscintilla/qscintilla-vl.spec

+ 10 - 7
lib/libk/libktorrent/libktorrent-vl.spec

@@ -1,19 +1,19 @@
 Name:    libktorrent
 Summary: Library providing torrent downloading code
-Version: 1.0.2
-Release: 3%{?_dist_release}
+Version: 1.0.5
+Release: 1%{?_dist_release}
 
 Group:   System Environment/Libraries
 License: GPLv2+
 URL:     http://ktorrent.org/
 
-Source0: http://ktorrent.org/downloads/4.0.2/libktorrent-%{version}.tar.bz2 
+Source0: http://ktorrent.org/downloads/4.0.5/libktorrent-%{version}-3.tar.bz2 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libboost-devel
 BuildRequires: gettext
 BuildRequires: gmp-devel
-BuildRequires: kdelibs4-devel >= 4.5.0
+BuildRequires: kdelibs4-devel
 BuildRequires: qca2-devel
 
 %description
@@ -21,18 +21,18 @@ BuildRequires: qca2-devel
 
 %package devel
 Summary: Developer files for %{name}
+Summary(ja): %{name} の開発用ファイル
 Group:   Development/Libraries
 Obsoletes: ktorrent-devel <= 4.0
 Requires: %{name} = %{version}-%{release}
-Requires: kdelibs4-devel >= 4.5.0
+Requires: kdelibs4-devel 
 
 %description devel
 %{summary}.
 
 
-
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}-3
 
 %build
 mkdir -p %{_target_platform}
@@ -79,6 +79,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jan 26 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.0.5-1
+- new upstream release
+
 * Tue Aug 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.0.2-3
 - initial build for Vine Linux
 

+ 10 - 4
q/qscintilla/qscintilla-vl.spec

@@ -1,9 +1,9 @@
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%global pyqt4_version 4.7
+%global pyqt4_version 4.8
 
 %define ver 1.78
 
-%define qt4_ver 4.6.3
+%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_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)
@@ -15,12 +15,14 @@
 
 Summary:	A Scintilla port to Qt
 Name:		qscintilla
-Version:	2.4.4
-Release:	2%{?_dist_release}
+Version:	2.4.6
+Release:	1%{?_dist_release}
+
 # matches up (pretty much) with qt4
 License:	GPLv3 or GPLv2 with exceptions
 Group:		Development/Tools
 URL:		http://www.riverbankcomputing.co.uk/qscintilla
+
 Source:		QScintilla-gpl-%{version}.tar.gz
 # TODO: upstream this
 Patch1:         QScintilla-2-gpl-Qt4-incpath.patch
@@ -149,6 +151,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/sip/PyQt4/Qsci
 
 %changelog
+* 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
+
 * Wed Aug 25 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.4-2
 - rebuild with qt4-4.6.3
 - fix qt4_ver from 4.6.1 to 4.6.3