lynx,ncftp,w3m: change location of desktop file

gsettings-desktop-schemas: change keybinding of switch-input-source
others: new upstream release

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

c/caribou/caribou-vl.spec

@@ -1,5 +1,5 @@
 Name:           caribou
-Version:        0.4.15
+Version:        0.4.16
 Release:        1%{?_dist_release}
 Summary:        A simplified in-place on-screen keyboard
 
@@ -92,6 +92,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/vala/vapi/caribou-1.0.*
 
 %changelog
+* Wed Nov 26 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.4.16-1
+- new upstream release
+
 * Mon Oct 27 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 0.4.15-1
 - new upstream release
 

g/gsettings-desktop-schemas/gsettings-desktop-schemas-vl.spec

@@ -1,13 +1,13 @@
 # Basic Information
 Name:		gsettings-desktop-schemas
 Version:	3.14.1
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 License:	GPLv2
 Group:		System Environment/Base
 Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/3.14/%{name}-%{version}.tar.xz
 
 # settings for Vine
-Patch101:	gsettings-desktop-schemas-3.14.0-vine-settings.patch
+Patch101:	gsettings-desktop-schemas-3.14.1-vine-settings.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
@@ -114,6 +114,9 @@ fi
 
 
 %changelog
+* Tue Nov 25 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.14.1-2
+- update Patch101 (gsettings-desktop-schemas-3.14.1-vine-settings.patch)
+
 * Sat Nov 08 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.14.1-1
 - new upstream release
 - update Patch101 (gsettings-desktop-schemas-3.14.0-vine-settings.patch)

i/ibus/ibus-vl.spec

@@ -1,6 +1,6 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-%define	ver 1.5.4
+%define	ver 1.5.9
 %define	rel 1
 
 %define gjsver 3.4.1.20130115
@@ -26,16 +26,11 @@ URL: http://code.google.com/p/ibus/
 Source0: %{name}-%{version}.tar.gz
 Source1: http://fujiwara.fedorapeople.org/ibus/gnome-shell/ibus-gjs-%{gjsver}.tar.gz
 
-Patch0:  ibus-HEAD.patch
-Patch1:  ibus-810211-no-switch-by-no-trigger.patch
-Patch2:  ibus-541492-xkb.patch
-Patch3:  ibus-530711-preload-sys.patch
-Patch4:  ibus-xx-setup-frequent-lang.patch
-
-Patch94: %{name}-xx-vapi-build-failure.patch
+Patch0:  %{name}-HEAD.patch
+Patch1:  %{name}-xx-increase-timeout.patch
 
 # add Shift+space as trigger key instead of Ctrl+space
-Patch200: ibus-1.3.9-vine.patch
+Patch200: ibus-1.5.9-vine.patch
 
 Requires: gtk2, pyxdg, iso-codes, dbus-python >= 0.83.0
 Requires: notify-python
@@ -145,22 +140,13 @@ zcat %SOURCE1 | tar xf -
 %endif
 
 %patch0 -p1
-%patch1 -p1 -b .noswitch
-%if %have_libxkbfile
-%patch2 -p1 -b .xkb
-rm -f bindings/vala/ibus-1.0.vapi
-rm -f data/dconf/00-upstream-settings
-%endif
-%patch3 -p1 -b .preload-sys
-%patch4 -p1 -b .setup-frequent-lang
-
-#%patch94 -p1 -b .vapi
+%patch1 -p1 -b .tmout
 
 %patch200 -p1 -b .vine
 
-%if %have_libxkbfile
-autoreconf -if
-%endif
+#%if %have_libxkbfile
+#autoreconf -if
+#%endif
 %configure \
 	--disable-static \
 	--enable-vala=yes \
@@ -347,6 +333,13 @@ dconf update
 %endif
 
 %changelog
+* Wed Nov 26 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.5.9-1
+- update to 1.5.9
+- remove old patches
+- update Patch0 (ibus-HEAD.patch) from fedora
+- add Patch1 (ibus-xx-increase-timeout.patch) from fedora
+- update Patch200 (ibus-1.5.9-vine.patch)
+
 * Sat Oct 26 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.5.4-1
 - update to 1.5.4
 - add BuildRequires: libnotify-devel

l/lynx/lynx-vl.spec

@@ -4,7 +4,7 @@ Summary: A text-based Web browser.
 Summary(ja): テキストベースのウェブブラウザ
 Name: lynx
 Version: 2.8.7
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 License: GPL
 Group: Applications/Internet
 URL: http://lynx.isc.org/
@@ -74,8 +74,8 @@ rm -rf %{buildroot}
 # Install Lang dependent resources
 install -m444 %{SOURCE1} %{buildroot}/etc/lynx.cfg.ja
 
-mkdir -p %{buildroot}%{_sysconfdir}/X11/applnk/Internet
-cat > %{buildroot}%{_sysconfdir}/X11/applnk/Internet/lynx.desktop <<EOF
+mkdir -p %{buildroot}%{_datadir}/applications
+cat > %{buildroot}%{_datadir}/applications/%{name}.desktop <<EOF
 [Desktop Entry]
 Name=Lynx
 Name[ja]=Lynx
@@ -84,6 +84,7 @@ Comment=Text based WWW browser
 Comment[ja]=テキストベースWWWブラウザ
 Exec=lynx
 Terminal=true
+Categories=Network;
 EOF
 
 %{find_lang} %{name}
@@ -101,13 +102,16 @@ rm -rf %{buildroot}
 %doc docs README INSTALLATION samples
 %doc test lynx.hlp lynx_help
 %doc COPYING CHANGES PROBLEMS
-%config(missingok) %{_sysconfdir}/X11/applnk/Internet/lynx.desktop
 %{_bindir}/lynx
+%{_datadir}/applications/%{name}.desktop
 %{_mandir}/*/*
 %config %{_sysconfdir}/lynx.cfg
 #%lang(ja) %config %{_sysconfdir}/lynx.cfg.ja
 
 %changelog
+* Tue Nov 25 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.8.7-3
+- change location of desktop file
+
 * Sat Dec 28 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.8.7-2
 - rebuild with VineSeed environment
 

n/nautilus/nautilus-vl.spec

@@ -14,7 +14,7 @@
 Name:			nautilus
 Summary:		Nautilus is a file manager for GNOME
 Summary(ja):	Nautilus - GNOME ファイルマネージャ
-Version:		3.14.1
+Version:		3.14.2
 Release:		1%{?_dist_release}
 License:		GPLv2+
 Group:			User Interface/Desktops
@@ -193,6 +193,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 
 
 %changelog
+* Wed Nov 26 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.14.2-1
+- new upstream release
+
 * Wed Nov 19 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.14.1-1
 - new upstream release
 - remove Patch0 (nautilus-3.14.0-git20141015.patch)

n/ncftp/ncftp-vl.spec

@@ -2,7 +2,7 @@ Summary: An improved FTP client.
 Name: ncftp
 Version: 3.2.5
 Epoch: 2
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 License: Distributable
 Group: Applications/Internet
 Source0: ftp://ftp.ncftp.com/ncftp/ncftp-%{version}-src.tar.bz2
@@ -41,8 +41,8 @@ mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
 
 %makeinstall BINDIR=$RPM_BUILD_ROOT%{_bindir}
 
-mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Internet
-cat > $RPM_BUILD_ROOT/etc/X11/applnk/Internet/ncftp.desktop << EOF
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+cat > $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop << EOF
 [Desktop Entry]
 Name=NcFTP
 Name[sv]=NcFTP
@@ -51,10 +51,11 @@ Comment=NcFTP - a text mode FTP client
 Comment[sv]=NcFTP - en textbaserad FTP-klient
 Comment[de]=NcFTP - ein Textmodus FTP-Client
 Comment[ja]=NcFTP - コンソールベースの FTP クライアント
-Icon=ftp.xpm
+Icon=gnome-fs-ftp
 Exec=ncftp
 Type=Application
 Terminal=1
+Categories=Network;
 EOF
 
 # yves - 3.1.1-1mdk - fix doc perm
@@ -66,12 +67,15 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc README.txt doc/{LICENSE,READLINE,what_changed_between_v2_v3}.txt doc/html
-%config(missingok) /etc/X11/applnk/Internet/ncftp.desktop
 %{_bindir}/*
+%{_datadir}/applications/%{name}.desktop
 %{_mandir}/man1/*
 
 
 %changelog
+* Tue Nov 25 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2.5-3
+- change location of desktop file
+
 * Sun Jan 12 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.2.5-2
 - rebuild with VineSeed environment
 

n/notification-daemon/notification-daemon-vl.spec

@@ -6,13 +6,13 @@
 
 Summary: Notification Daemon 
 Name: notification-daemon
-Version: 0.7.6
-Release: 2%{?_dist_release}
+Version: 3.14.1
+Release: 1%{?_dist_release}
 URL: http://www.galago-project.org/specs/notification/ 
 License: GPL
 Group: System Environment/Libraries
 
-Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.7/%{name}-%{version}.tar.xz
+Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.14/%{name}-%{version}.tar.xz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: dbus >= %{dbus_version}
@@ -52,10 +52,14 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc COPYING ChangeLog NEWS
+%{_sysconfdir}/xdg/autostart/notification-daemon-autostart.desktop
 %{_libexecdir}/notification-daemon
 %{_datadir}/applications/notification-daemon.desktop
 
 %changelog
+* Wed Nov 26 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.14.1-1
+- new upstream release
+
 * Tue Dec 31 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.7.6-2
 - rebuild with VineSeed environment
 

w/w3m/w3m-vl.spec

@@ -9,7 +9,7 @@ Summary: A Pager with WWW capability
 Summary(ja): World Wide Web に対応したページャ
 Name: w3m
 Version: 0.5.3
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 
 License: BSD
 Group: Applications/Internet
@@ -128,10 +128,8 @@ find . -type d -name "CVS" | xargs rm -rf
 # prepare system-wide preference file
 mkdir -p %{buildroot}%{_sysconfdir}/w3m
 
-# prepare applnk
-%define applnkdir /etc/X11/applnk/Internet
-mkdir -p %{buildroot}/%{applnkdir}
-cat > %{buildroot}/%{applnkdir}/%{name}.desktop <<EOF
+mkdir -p %{buildroot}%{_datadir}/applications
+cat > %{buildroot}%{_datadir}/applications/%{name}.desktop <<EOF
 [Desktop Entry]
 Name=%{name}
 Type=Application
@@ -139,6 +137,7 @@ Comment=A Pager with WWW capability
 Comment[ja]=WWW対応ページャ
 Exec=w3m-term
 Terminal=false
+Categories=Network;
 EOF
 
 # eliminate executable bit in %doc
@@ -161,11 +160,11 @@ fi
 %defattr(-,root,root)
 %doc Bonus ChangeLog NEWS README doc doc-jp
 %attr(755,root,root) %config /etc/profile.d/*
-%config(missingok) %{applnkdir}/%{name}.desktop
 %dir %{_sysconfdir}/w3m
 %{_bindir}/w3m*
 %exclude %{_libexecdir}/w3m/w3mimgdisplay
 %{_libexecdir}/w3m/
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/w3m/
 %{_datadir}/locale/*/LC_MESSAGES/*
 %{_mandir}/ja/man1/w3m.1*
@@ -175,6 +174,9 @@ fi
 %{_libexecdir}/w3m/w3mimgdisplay
 
 %changelog
+* Tue Nov 25 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.5.3-3
+- change localtion of desktop file
+
 * Mon Sep 15 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.5.3-2
 - updated Source11 to call /usr/lib/rpm/perl.req
 - added Patch200 and 201 for building current environment