Browse Source

2015-01-17 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* kcoloredit, kgrab, kiconedit, kuickshow: rebuilt
	* kdbg, knemo: updated
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9275 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 10 years ago
parent
commit
3e992174b1

+ 15 - 6
k/kcoloredit/kcoloredit-vl.spec

@@ -2,16 +2,20 @@
 
 
 Name:           kcoloredit
 Name:           kcoloredit
 Version:        4.4.0
 Version:        4.4.0
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        A color palette Editor
 Summary:        A color palette Editor
 Summary(ja):    カラーパレットエディタ
 Summary(ja):    カラーパレットエディタ
 
 
-Group:          Applications/Accessories
+Group:          Applications/Graphics
 License:        GPLv2+
 License:        GPLv2+
-URL:            http://www.kde.org
+URL:            https://www.kde.org/applications/graphics/kcoloredit/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/kcoloredit-%{iversion}-kde%{version}.tar.bz2
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/kcoloredit-%{iversion}-kde%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 
+## upstream patches
+# fix FTBFS with the new stricter ld in F13 (#564815): explicitly link libX11
+Patch100: kcoloredit-2.0.0-kde4.4.0-ftbfs.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 #BuildRequires:  kde-filesystem >= 4
 #BuildRequires:  kde-filesystem >= 4
 BuildRequires:  kdelibs4-devel >= 4
 BuildRequires:  kdelibs4-devel >= 4
 BuildRequires:  desktop-file-utils
 BuildRequires:  desktop-file-utils
@@ -28,12 +32,11 @@ color palettes and for color choosing and naming.
 
 
 %prep
 %prep
 %setup -qn kcoloredit-%{iversion}-kde%{version}
 %setup -qn kcoloredit-%{iversion}-kde%{version}
+%patch100 -p1 -b .ftbfs
 
 
 %build
 %build
-
 mkdir -p %{_target_platform}
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 pushd %{_target_platform}
-unset QTDIR || : ; . /etc/profile.d/qt4.sh
 %{cmake} \
 %{cmake} \
     -DCMAKE_BUILD_TYPE=release \
     -DCMAKE_BUILD_TYPE=release \
     -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
     -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
@@ -86,6 +89,12 @@ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 %{_datadir}/icons//hicolor/*/*/kcoloredit.png
 %{_datadir}/icons//hicolor/*/*/kcoloredit.png
 
 
 %changelog
 %changelog
+* Fri Jan 16 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 4.4.0-2
+- rebuilt on current VineSeed
+- added Patch100 from Fedora
+  * Sat Feb 13 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.4.0-2
+  - fix FTBFS with the new stricter ld in F13 (#564815): explicitly link libX11
+
 * Mon Mar 22 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.0-1
 * Mon Mar 22 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.0-1
 - new upstream release
 - new upstream release
 - built with new toolchain
 - built with new toolchain

+ 45 - 30
k/kdbg/kdbg-vl.spec

@@ -1,80 +1,95 @@
 Summary: KDbg - a graphical user interface to gdb
 Summary: KDbg - a graphical user interface to gdb
 Summary(ja): GDB のグラフィカルユーザインターフェイス
 Summary(ja): GDB のグラフィカルユーザインターフェイス
 Name: kdbg
 Name: kdbg
-Version: 2.1.1
+Version: 2.5.4
-Release: 3%{?_dist_release}
+Release: 1%{?_dist_release}
-License: GPL
+
-URL: http://www.kdbg.org/
+License: GPL+
 Group: Applications/Development
 Group: Applications/Development
+URL: http://www.kdbg.org/
 
 
-Source: %{name}-%{version}.tar.gz
+Source: http://download.sourceforge.net/kdbg/%{name}-%{version}.tar.gz
-Patch0: kdbg-2.1.0-gcc44.patch
+Patch0: kdbg-2.5.1-icons.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: kdelibs3-devel
+BuildRequires: cmake
 BuildRequires: desktop-file-utils
 BuildRequires: desktop-file-utils
-BuildRequires: arts-devel
+BuildRequires: gettext
+BuildRequires: kdelibs4-devel
 Requires(post): desktop-file-utils
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires: gdb
 Requires: gdb
+Requires: xterm
 
 
 %description
 %description
-KDbg is a graphical user interface to gdb, the GNU debugger. 
+KDbg is a K Desktop Environment (KDE) GUI for gdb, the GNU debugger.
-It provides an intuitive interface for setting breakpoints, 
+KDbg provides the programmer with an intuitive interface for setting
-inspecting variables, and stepping through code. 
+breakpoints, inspecting variables, and stepping through code. KDbg
-
+requires X and KDE to be installed in order to run.
-KDbg requires KDE, the K Desktop Environment, but you can 
-of course debug any program.
 
 
 %prep
 %prep
 %setup -q
 %setup -q
-%patch0 -p1 -b .gcc44
+%patch0 -p1 -b .icons
 
 
 %build
 %build
-unset QTDIR || : ; source /etc/profile.d/qt.sh
+# don't install icons, which are included in oxygen-icon-theme
-
+rm -f kdbg/pics/*action-debug-run*
-%configure \
+
-	--disable-rpath \
+mkdir -p %{_target_platform}
-        --enable-new-ldflags
+pushd %{_target_platform}
-
+%{cmake} \
-# don't use parallel build
+    -DCMAKE_BUILD_TYPE=release \
-#make %{?_smp_mflags}
+    -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
-make
+    -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/kde4 \
+    -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
+    -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Vine Linux" \
+    ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT install/fast -C %{_target_platform}
 
 
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
 %post
 %post
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/oxygen  &> /dev/null || :
 
 
 %postun
 %postun
 if [ $1 -eq 0 ] ; then
 if [ $1 -eq 0 ] ; then
   update-desktop-database -q &> /dev/null
   update-desktop-database -q &> /dev/null
   touch --no-create %{_datadir}/icons/hicolor &> /dev/null
   touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  touch --no-create %{_datadir}/icons/oxygen  &> /dev/null || :
   gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
   gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/oxygen  &> /dev/null || :
 fi
 fi
 
 
 %posttrans
 %posttrans
 update-desktop-database -q &> /dev/null
 update-desktop-database -q &> /dev/null
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/oxygen  &> /dev/null || :
 
 
 
 
 %files
 %files
 %defattr(-,root,root)
 %defattr(-,root,root)
-%doc COPYING ChangeLog README
+%doc BUGS ChangeLog* COPYING README TODO ReleaseNotes-*
 %{_bindir}/kdbg
 %{_bindir}/kdbg
-%{_datadir}/applications/*
+%{_datadir}/applications/kde4/*
-%{_datadir}/apps/*
+%{_datadir}/kde4/apps/%{name}
-%{_datadir}/config/*
 %{_datadir}/icons/*/*/*/*
 %{_datadir}/icons/*/*/*/*
 %{_datadir}/locale/*
 %{_datadir}/locale/*
-%doc %{_datadir}/doc/HTML/*
+%config (noreplace) %{_datadir}/config/kdbgrc
+%doc %{_docdir}/HTML/*
 
 
 %changelog
 %changelog
+* Sat Jan 17 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.5.4-1
+- updated to 2.5.4
+- built on current VineSeed
+
 * Fri Apr 16 2010 Shu KONNO <owa@bg.wakwak.com> 2.1.1-3
 * Fri Apr 16 2010 Shu KONNO <owa@bg.wakwak.com> 2.1.1-3
 - rebuilt without smp option
 - rebuilt without smp option
 - added BR: arts-devel
 - added BR: arts-devel

+ 5 - 9
k/kgrab/kgrab-vl.spec

@@ -1,23 +1,19 @@
-# Review Request:
-# https://bugzilla.redhat.com/show_bug.cgi?id=432613
-
 %define kdeversion 4.4.0
 %define kdeversion 4.4.0
 
 
 Name:           kgrab
 Name:           kgrab
 Summary:        A screen grabbing utility
 Summary:        A screen grabbing utility
 Summary(ja):    スクリーンキャプチャユーティリティ
 Summary(ja):    スクリーンキャプチャユーティリティ
 Version:        0.1.1
 Version:        0.1.1
-Release:        23%{?dist}
+Release:        24%{?_dist_release}
 
 
 Group:          Applications/Accessories
 Group:          Applications/Accessories
 License:        GPLv2+
 License:        GPLv2+
 URL:            http://extragear.kde.org
 URL:            http://extragear.kde.org
 
 
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{kdeversion}/src/extragear/%{name}-%{version}-kde%{kdeversion}.tar.bz2
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{kdeversion}/src/extragear/%{name}-%{version}-kde%{kdeversion}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  kdelibs4-devel >= 4
 BuildRequires:  kdelibs4-devel >= 4
-#BuildRequires:  kde-filesystem >= 4
 BuildRequires:  cmake
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  gettext
@@ -39,12 +35,9 @@ mkdir -p %{_target_platform}
 pushd %{_target_platform}
 pushd %{_target_platform}
 %cmake \
 %cmake \
     -DCMAKE_BUILD_TYPE=release \
     -DCMAKE_BUILD_TYPE=release \
-    -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
     -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
     -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
     -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/kde4 \
     -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/kde4 \
-    -DLIB_INSTALL_DIR:PATH=%{_libdir} \
     -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
     -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
-    -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
     ..
     ..
 popd
 popd
 
 
@@ -92,6 +85,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 
 
 %changelog
 %changelog
+* Fri Jan 16 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 0.1.1-24
+- rebuilt on current VineSeed
+
 * Sat Jan 15 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.1.1-23
 * Sat Jan 15 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.1.1-23
 - initial build for Vine Linux
 - initial build for Vine Linux
 - added Japanese summary
 - added Japanese summary

+ 10 - 4
k/kiconedit/kiconedit-vl.spec

@@ -2,11 +2,11 @@ Name:           kiconedit
 Summary:        An icon editor
 Summary:        An icon editor
 Summary(ja):    アイコンエディタ
 Summary(ja):    アイコンエディタ
 Version:        4.4.0
 Version:        4.4.0
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
 
 
-Group:          Applications/Accessories
+Group:          Applications/Graphics
 License:        GPLv2+
 License:        GPLv2+
-URL:            http://www.kde.org
+URL:            https://www.kde.org/applications/graphics/kiconedit/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/%{name}-%{version}.tar.bz2
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/%{name}-%{version}.tar.bz2
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
@@ -26,10 +26,12 @@ KDE using the standard icon palette.
 %prep
 %prep
 %setup -q
 %setup -q
 
 
+# update docbook version to make doc-translations build with kdelibs >= 4.5
+sed -i -e 's#<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4\.1\.2-Based Variant V1\.1//EN" "dtd/kdex\.dtd" \[#<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [#g' doc-translations/*_kiconedit/*/index.docbook
+
 %build
 %build
 mkdir -p %{_target_platform}
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 pushd %{_target_platform}
-unset QTDIR || : ; . /etc/profile.d/qt4.sh
 %{cmake} \
 %{cmake} \
     -DCMAKE_BUILD_TYPE=release \
     -DCMAKE_BUILD_TYPE=release \
     -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
     -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
@@ -90,6 +92,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 
 
 %changelog
 %changelog
+* Fri Jan 16 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 4.4.0-3
+- rebuilt on current VineSeed
+- update docbook version to make doc-translations 
+
 * Sun Jul 18 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.0-2
 * Sun Jul 18 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.4.0-2
 - added Conflicts: kdegraphics3
 - added Conflicts: kdegraphics3
 
 

+ 18 - 10
k/knemo/knemo-vl.spec

@@ -1,8 +1,8 @@
 Name:             knemo
 Name:             knemo
 Summary:          A KDE network monitoring tool
 Summary:          A KDE network monitoring tool
-Summary(ja):      KDE ネットワーク監視ツール
+Summary(ja):      KDE ネットワーク監視ツール
-Version:          0.6.3
+Version:          0.7.6
-Release:          2%{?_dist_release}
+Release:          1%{?_dist_release}
 
 
 Group:            Applications/Internet
 Group:            Applications/Internet
 License:          GPLv2+
 License:          GPLv2+
@@ -10,8 +10,12 @@ URL:              http://extragear.kde.org/apps/knemo/
 Source0:          http://kde-apps.org/CONTENT/content-files/12956-%{name}-%{version}.tar.bz2
 Source0:          http://kde-apps.org/CONTENT/content-files/12956-%{name}-%{version}.tar.bz2
 
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
-BuildRequires:    cmake desktop-file-utils gettext
+BuildRequires:    cmake
-BuildRequires:    kdelibs4-devel wireless-tools-devel libnl-devel
+BuildRequires:    desktop-file-utils
+BuildRequires:    gettext
+BuildRequires:    kdebase-workspace-devel
+BuildRequires:    libnl3-devel
+BuildRequires:    wireless-tools-devel
 
 
 %description
 %description
 KNemo displays for every network interface an icon in the systray. Tooltips
 KNemo displays for every network interface an icon in the systray. Tooltips
@@ -26,7 +30,6 @@ and iwconfig tools.
 %build
 %build
 mkdir -p %{_target_platform}
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 pushd %{_target_platform}
-unset QTDIR || : ; . /etc/profile.d/qt4.sh
 %{cmake} \
 %{cmake} \
     -DCMAKE_BUILD_TYPE=release \
     -DCMAKE_BUILD_TYPE=release \
     -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
     -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
@@ -67,17 +70,22 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %files -f %{name}.lang
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README
 %{_bindir}/%{name}
 %{_bindir}/%{name}
 %{_libdir}/kde4/kcm_knemo.so
 %{_libdir}/kde4/kcm_knemo.so
-%{_datadir}/kde4/apps/%{name}
 %{_datadir}/applications/kde4/%{name}.desktop
 %{_datadir}/applications/kde4/%{name}.desktop
-%{_datadir}/kde4/services/kcm_knemo.desktop
 %{_datadir}/autostart/%{name}.desktop
 %{_datadir}/autostart/%{name}.desktop
+%{_datadir}/kde4/apps/%{name}
+%{_datadir}/kde4/apps/kconf_update/%{name}*
+%{_datadir}/kde4/services/kcm_knemo.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}*
 %{_datadir}/icons/hicolor/*/apps/%{name}*
-%{_datadir}/icons/hicolor/22x22/status/%{name}*
+%{_datadir}/icons/hicolor/*/status/%{name}*
 
 
 %changelog
 %changelog
+* Sat Jan 17 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 0.7.6-1
+- updated to 0.7.6
+- built on current VineSeed
+
 * Tue Jul 20 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.6.3-2
 * Tue Jul 20 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.6.3-2
 - Initial build for Vine Linux
 - Initial build for Vine Linux
 
 

+ 6 - 3
k/kuickshow/kuickshow-vl.spec

@@ -1,7 +1,8 @@
 Name: kuickshow
 Name: kuickshow
 Summary: a very fast and comfortable imageviewer for KDE
 Summary: a very fast and comfortable imageviewer for KDE
+Summary(ja): KDE 用の高速かつ快適な画像ビューワー
 Version: 0.9.1
 Version: 0.9.1
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 
 
 Group: Applications/Graphics
 Group: Applications/Graphics
 License: GPLv2+
 License: GPLv2+
@@ -21,7 +22,7 @@ Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 
 
 %description
 %description
- KuickShow is an image browser/viewer with a nice filebrowser to select 
+KuickShow is an image browser/viewer with a nice filebrowser to select 
 images to be shown, slideshow support and the ability to display the 
 images to be shown, slideshow support and the ability to display the 
 following image formats: jpg, gif, tiff, png, bmp, psd, xpm, xbm, pbm 
 following image formats: jpg, gif, tiff, png, bmp, psd, xpm, xbm, pbm 
 and eim. Images can be displayed either in their own window, as large 
 and eim. Images can be displayed either in their own window, as large 
@@ -34,7 +35,6 @@ KuickShow also has a slideshow mode.
 %build
 %build
 mkdir -p %{_target_platform}
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 pushd %{_target_platform}
-unset QTDIR || : ; . /etc/profile.d/qt4.sh
 %{cmake} \
 %{cmake} \
     -DCMAKE_BUILD_TYPE=release \
     -DCMAKE_BUILD_TYPE=release \
     -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
     -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
@@ -82,6 +82,9 @@ update-desktop-database -q %{_datadir}/applications > /dev/null 2>&1 ||:
 %{_datadir}/doc/HTML/*/kuickshow/
 %{_datadir}/doc/HTML/*/kuickshow/
 
 
 %changelog
 %changelog
+* Fri Jan 16 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 0.9.1-3
+- rebuilt on current VineSeed
+
 * Sun May 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.9.1-2
 * Sun May 15 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.9.1-2
 - add BuildRequires: qt4-devel, libXpm-devel
 - add BuildRequires: qt4-devel, libXpm-devel