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

	* qca-ossl, qimageblitz, qoauth, qt-assistant-adp,
	  qtsoap: rebuilt
	* qca2: added patch
	


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

q/qca-ossl/qca-ossl-vl.spec

@@ -1,14 +1,16 @@
 %define beta 3
 
-%define qt4_ver 4.8.0
+%define qt4_ver 4.8.6
 %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}/qt4)
 %define _qt4_plugindir %(pkg-config --variable plugindir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
 
 Name:       qca-ossl
-Summary:    OpenSSL plugin for the Qt Cryptographic Architecture v2
 Version:    2.0.0
-Release:    0.beta%{beta}.14%{?_dist_release}
+Release:    0.beta%{beta}.15%{?_dist_release}
+
+Summary:    OpenSSL plugin for the Qt Cryptographic Architecture v2
+Summary(ja): Qt 暗号アーキテクチャ v2 用の OpenSSL プラグイン
 
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -19,7 +21,6 @@ Patch1:     qca-ossl-2.0.0-no-whirlpool.patch
 Patch2:     qca-ossl-2.0.0-openssl100.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-root
-
 BuildRequires: qt4-devel
 BuildRequires: qca2-devel >= 2.0.0-1
 BuildRequires: openssl-devel >= 0.9.8
@@ -40,9 +41,7 @@ contains the TLS plugin.
 
 %build
 unset QTDIR
-MAKE=%{_bindir}/make \
 ./configure \
-    --qtdir=%{_qt4_prefix} \
     --no-separate-debug-info \
     --verbose
 make %{?_smp_mflags}
@@ -66,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Feb  9 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 2.0.0-0.beta3.15
+- rebuilt on current VineSeed
+- added Japanese summary
+
 * Mon Jan  9 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 2.0.0-0.beta3.14
 - rebuilt with qt-4.8.0
 

q/qca2/qca2-vl.spec

@@ -1,14 +1,16 @@
-%define _qt4_datadir %(pkg-config --variable datadir --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
-
 Name:           qca2
-Summary:        Qt Cryptographic Architecture
 Version:        2.0.3
-Release:        3%{?_dist_release}
+Release:        4%{?_dist_release}
+Summary:        Qt Cryptographic Architecture
+Summary(ja):    Qt 暗号アーキテクチャ
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://delta.affinix.com/qca
+
 Source0:        http://delta.affinix.com/download/qca/2.0/qca-%{version}.tar.bz2
+# Allow gcc to compile qca
+Patch0:         qca-2.0.3-gcc47.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  qt4-devel >= 4.2
@@ -26,6 +28,7 @@ application!
 
 %package        devel
 Summary:        Qt Cryptographic Architecture development files
+Summary(ja):    Qt 暗号アーキテクチャの開発用ファイル
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       qt4-devel >= %{_qt4_version}
@@ -35,16 +38,17 @@ This packages contains the development files for QCA
 
 %prep
 %setup -q -n qca-%{version}
+%patch0 -p1
 
 %build
-MAKE=%{_bindir}/make \
+unset QTDIR
 ./configure \
-  --prefix=%{_prefix} \
-  --includedir=%{_includedir} \
-  --libdir=%{_libdir} \
-  --datadir=%{_datadir} \
-  --no-separate-debug-info \
-  --verbose
+      --prefix=%{_prefix} \
+      --includedir=%{_includedir} \
+      --libdir=%{_libdir} \
+      --datadir=%{_datadir} \
+      --no-separate-debug-info \
+      --verbose
 
 sed -i -e /strip/d Makefile
 make %{?_smp_mflags}
@@ -80,6 +84,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Feb  9 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 2.0.3-4
+- rebuilt on current VineSeed
+- added patch0 from Fedora
+- added Japanese summary
+
 * Sun Jan  8 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 2.0.3-3
 - rebuilt with qt-4.8.0
 

q/qimageblitz/qimageblitz-vl.spec

@@ -1,22 +1,25 @@
 %define kde_major_version 4
 %define qt_ver 4.6.1
 
-Name: qimageblitz
-Summary: Blitz KDE/Qt image filter library
+Name:    qimageblitz
 Version: 0.0.6
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
+Summary: Graphical effect and filter library
+Summary(ja): グラフィック効果・グラフィックフィルタライブラリ
 
-Group: System Environment/Libraries
-License: LGPL
-URL: http://sourceforge.net/projects/qimageblitz
+Group:   System Environment/Libraries
+License: BSD and ImageMagick
+URL:     http://qimageblitz.sourceforge.net/
 
-Source: %{name}-%{version}.tar.bz2
+Source0: http://download.kde.org/stable/qimageblitz/qimageblitz-%{version}.tar.bz2
+# upstreamed to kdesupport
+# r1204248 | rdieter | 2010-12-06 08:05:09 -0600 (Mon, 06 Dec 2010) | 2 lines
+Patch100: qimageblitz-0.0.4-noexecstack.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: qt4-devel >= %{qt_ver}
 BuildRequires: cmake >= 2.4.5
 BuildRequires: pkgconfig
-Requires: qt4 >= %{qt_ver}
 
 %description
 Blitz is a graphical effect and filter library for KDE4.0 that contains
@@ -24,7 +27,8 @@ many improvements over KDE 3.x's kdefx library including bugfixes, memory
 and speed improvements, and MMX/SSE support.
 
 %package devel
-Summary: Development files for blitz
+Summary: Development files for %{name}
+Summary(ja): %{name} の開発用ファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: qt4-devel
@@ -34,12 +38,12 @@ Header files for developing applications using blitz
 
 %prep
 %setup -q
+%patch100 -p1
 
 %build
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%cmake -DCMAKE_BUILD_TYPE=release ..
+%cmake %{?_cmake_skip_rpath} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -48,6 +52,10 @@ make %{?_smp_mflags} -C %{_target_platform}
 rm -rf $RPM_BUILD_ROOT
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
+%check
+export PKG_CONFIG_PATH=$RPM_BUILD_ROOT%{_datadir}/pkgconfig:$RPM_BUILD_ROOT%{_libdir}/pkgconfig
+test "$(pkg-config --modversion qimageblitz)" = "4.0.0"
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -57,16 +65,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_bindir}*
+%doc Changelog README* COPYING
 %{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root)
+%{_bindir}/blitztest
 %{_includedir}/qimageblitz
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Feb  9 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.0.6-4
+- rebuilt on current VineSeed
+- fixed LICENSE to BSD
+- moved %{_bindir}/blitztest to devel subpackage
+- added Japanese summary
+
 * Sun Sep 15 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.0.6-3
 - rebuild with current VineSeed environment
 

q/qoauth/qoauth-vl.spec

@@ -2,14 +2,17 @@
 %global gitdate 20100625
 #global posttag .%{?gitdate}git%{?githash}
 
-%define qt4_ver 4.8.0
+%define qt4_ver 4.8.6
 %define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo %{qt4_ver})
-%define _qt4_datadir %(pkg-config --variable datadir --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
+%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
+%define _qt4_bindir %(pkg-config --variable bindir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/bin)
+%define _qt4_datadir %(pkg-config --variable datadir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix})
 
 Name:		qoauth
-Summary:	Qt-based C++ library for OAuth authorization scheme
 Version:	1.0.1
-Release:	4%{?_dist_release}
+Release:	5%{?_dist_release}
+Summary:	Qt library OAuth authorization scheme
+Summary(ja):	OAuth 認証スキームのための Qt ライブラリ
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
@@ -28,10 +31,9 @@ OAuth authorization scheme.
 
 %package devel
 Summary:	Development files for the Qt OAuth support library
+Summary(ja):	Qt OAuth ライブラリの開発用ファイル
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	qt4-devel >= %{_qt4_version}
-Requires:	qca2-devel
 
 %description devel
 The %{name}-devel package contains libraries, header files and documentations 
@@ -44,13 +46,14 @@ sed -i -e '/^ *docs \\$/d' \
 sed -i -e 's\/lib\/%{_lib}\g' src/pcfile.sh
 
 %build
-export PATH=%{_qt4_prefix}/bin:$PATH
-%{_qt4_prefix}/bin/qmake PREFIX="%{_prefix}"
+export PATH=%{_qt4_bindir}:$PATH
+qmake PREFIX="%{_prefix}"
 make %{?_smp_mflags}
 
 
 %install
-make install INSTALL="install -p" INSTALL_ROOT=%{buildroot}
+rm -rf $RPM_BUILD_ROOT
+make install INSTALL="install -p" INSTALL_ROOT=$RPM_BUILD_ROOT
 doxygen Doxyfile
 
 # fix the time stamp
@@ -62,7 +65,7 @@ done
 make check || :
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
@@ -83,6 +86,10 @@ rm -rf %{buildroot}
 %{_includedir}/*
 
 %changelog
+* Mon Feb  9 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.0.1-5
+- rebuilt on current VineSeed
+- added Japanese summary
+
 * Mon Jan  9 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.0.1-4
 - rebuilt with qt-4.8.0
 

q/qt-assistant-adp/qt-assistant-adp-vl.spec

@@ -1,7 +1,8 @@
 Name:    qt-assistant-adp
-Summary: Compatibility version of Qt Assistant
 Version: 4.6.3
-Release: 5%{?_dist_release}
+Release: 6%{?_dist_release}
+Summary: Compatibility version of Qt Assistant
+Summary(ja): Qt Assistant の互換性を維持するためのライブラリ
 
 Group: System Environment/Libraries
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
@@ -29,6 +30,7 @@ New applications should use the new version of Qt Assistant introduced in Qt
 
 %package devel
 Summary: Development files for the compatibility QAssistantClient
+Summary(ja): QAssistantClient 互換の開発用ファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: qt4-devel
@@ -139,6 +141,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Feb  9 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 4.6.3-6
+- rebuilt on current VineSeed
+- added Japanese summary
+
 * Sat Jan 07 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.3-5
 - rebuilt with qt-4.8.0
 

q/qtsoap/qtsoap-vl.spec

@@ -1,12 +1,13 @@
-%define _qt4_ver 4.8.0
+%define _qt4_ver 4.8.6
 %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}/qt4)
 %define _qt4_headerdir %(pkg-config --variable headerdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
 
 Name:           qtsoap
 Summary:        The Simple Object Access Protocol Qt-based client side library
+Summary(ja):    Qt ベースの SOAP クライアントライブラリ
 Version:        2.7
-Release:        4%{?_dist_release}
+Release:        5%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        LGPLv2 with exceptions or GPLv3
@@ -78,6 +79,10 @@ rm -rf %{buildroot}
 %{_qt4_headerdir}/QtSoap/
 
 %changelog
+* Mon Feb  9 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 2.7-5
+- rebuilt on current VineSeed
+- added Japanese summary
+
 * Sun Jan  8 2012 Ryoiochi INAGAKI <ryo1@bc.wakwak.com> - 2.7-4
 - rebuilt with qt-4.8.0