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

	* auto-install, js2-mode, lua-mode,
	  migemo, php-mode, po-mode: updated
	  


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

a/auto-install/auto-install-vl.spec

@@ -1,41 +1,42 @@
 %define _noVersionedDependencies	1
-%define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
+%define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'Requires(pre):%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
 %define emacsen_pkgdir /usr/lib/emacsen-common/packages
 %define	origname auto-install
-%define origver  0.1.24
-
-Summary:      Auto install elisp file
-Name:         %{origname}
-Version:      %{origver}
-Release:      2%{?_dist_release}
-
-Source0:      http://www.emacswiki.org/emacs/download/auto-install.el
-Source1:      %{origname}-install.sh
-Source2:      %{origname}-remove.sh
-Source3:      vine-default-%{origname}.el
-Source4:      %{origname}-init.el
-Source5:      http://www.gnu.org/licenses/gpl-3.0.txt
-
-License:      GPLv3+
-Group:        Applications/Editors/Emacs
-URL:          http://www.emacswiki.org/emacs/auto-install.el
-BuildRoot:    %{_tmppath}/%{name}-%{version}-root
-BuildArch:    noarch
-
-Requires:     emacsen
-PreReq:       emacsen
-Conflicts:    flim < 1.14.9-2
-%prereq_ge    emacsen-common
-
-Distribution: Vine Linux
-Vendor:       Project Vine
-Packager:     iwaim
+%define origver  1.58
+
+Name:            %{origname}
+Version:         %{origver}
+Release:         1%{?_dist_release}
+Summary:         Auto install elisp file
+Summary(ja):     Emacs Lisp ファイルを自動的にインストールするツール
+
+Source0:         http://www.emacswiki.org/emacs/download/auto-install.el
+Source1:         %{origname}-install.sh
+Source2:         %{origname}-remove.sh
+Source3:         vine-default-%{origname}.el
+Source4:         %{origname}-init.el
+Source5:         http://www.gnu.org/licenses/gpl-3.0.txt
+
+License:         GPLv3+
+Group:           Applications/Editors/Emacs
+URL:             http://www.emacswiki.org/emacs/auto-install.el
+
+BuildRoot:       %{_tmppath}/%{name}-%{version}-root
+BuildArch:       noarch
+
+Requires(post):  emacsen
+Requires(preun): emacsen
+%prereq_ge       emacsen-common
+Conflicts:       flim < 1.14.9-2
+
+Distribution:    Vine Linux
+Vendor:          Project Vine
+Packager:        iwaim
 
 %description
-Auto install elisp file
+Auto install elisp file.
 
 %prep
-
 %setup -q -T -c %{origname}-%{origver}
 %{__cp} -a %{SOURCE5} .
 
@@ -102,6 +103,12 @@ fi
 
 
 %changelog
+* Fri Apr 17 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.58-1
+- updated to 1.58
+
+* Tue Feb 14 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.1.24-3
+- rebuild with Vine6 environment
+
 * Sun Mar  7 2010 IWAI, Masaharu <iwai@alib.jp> 0.1.24-2
 - update Conflicts flim version
 

j/js2-mode/js2-mode-install.sh

@@ -11,7 +11,7 @@ ELCDIR="/usr/share/${FLAVOR}/site-lisp/${PACKAGE}"
 STARTDIR=/etc/${FLAVOR}/site-start.d
 STARTFILE="${PACKAGE}-init.el"
 
-SOURCES="js2.el"
+SOURCES="js2-mode.el js2-imenu-extras.el"
 
 case "${FLAVOR}" in
     emacs)

j/js2-mode/js2-mode-vl.spec

@@ -1,28 +1,27 @@
 %define _noVersionedDependencies	1
-%define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
+%define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'Requires(pre):%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
 %define emacsen_pkgdir /usr/lib/emacsen-common/packages
 %define	origname js2-mode
-%define origver  20090723b
+%define origver  20141118
 
 Summary:      An improved JavaScript mode for GNU Emacs
 Name:         %{origname}
 Version:      %{origver}
-Release:      2%{?_dist_release}
+Release:      1%{?_dist_release}
 
-Source0:      http://js2-mode.googlecode.com/files/js2-%{origver}.el
+Source0:      https://github.com/mooz/%{name}/archive/%{version}.tar.gz
 Source1:      %{origname}-install.sh
 Source2:      %{origname}-remove.sh
 Source3:      vine-default-%{origname}.el
 Source4:      %{origname}-init.el
 
-License:      GPLv2
+License:      GPLv3+
 Group:        Applications/Editors/Emacs
 URL:          http://code.google.com/p/js2-mode/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-root
 BuildArch:    noarch
 
-Requires:     emacsen
-PreReq:       emacsen
+Requires(pre): emacsen
 %prereq_ge    emacsen-common
 
 Distribution: Vine Linux
@@ -48,8 +47,7 @@ Features:
 Note - this mode is for GNU Emacs, version 22 and higher. It does not support XEmacs.
 
 %prep
-
-%setup -q -T -c %{origname}-%{origver}
+%setup -q
 
 %build
 
@@ -65,7 +63,7 @@ mkdir -p %{buildroot}%{emacsen_pkgdir}/remove
 # install el files
 #
 
-cp -p %{SOURCE0} %{buildroot}%{_datadir}/emacs/site-lisp/%{origname}/js2.el
+cp -p js2*.el %{buildroot}%{_datadir}/emacs/site-lisp/%{origname}/
 cp -p %{SOURCE3} %{SOURCE4} %{buildroot}%{_datadir}/emacs/site-lisp/%{origname}
 
 
@@ -108,11 +106,16 @@ fi
 
 %files
 %defattr(-,root,root)
+%doc LICENSE README.md
 %{_datadir}/emacs/site-lisp/%{origname}
 %{emacsen_pkgdir}/install/%{origname}
 %{emacsen_pkgdir}/remove/%{origname}
 
 %changelog
+* Fri Apr 17 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 20141118-1
+- new upstream release
+- updated Source1
+
 * Wed Mar 10 2010 IWAI, Masaharu <iwai@alib.jp> 20090723b-2
 - correct output message on js2-mode-install.sh (SOURCE1)
 

l/lua-mode/lua-mode-vl.spec

@@ -1,7 +1,7 @@
 %define _noVersionedDependencies	1
 %define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'Requires(post):%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
 %define	origname lua-mode
-%define origver  20110324
+%define origver  20140514
 
 Summary:      Emacs major mode for editing Lua code
 Summary(ja):  Lua コード編集用 Emacs メジャーモード
@@ -9,19 +9,19 @@ Name:         %{origname}
 Version:      %{origver}
 Release:      1%{?_dist_release}
 
-Source0:      lua-mode-%{version}.zip
+Source0:      https://github.com/immerrr/lua-mode/archive/v%{version}.tar.gz
 Source1:      %{origname}-install.sh
 Source2:      %{origname}-remove.sh
 Source3:      vine-default-%{origname}.el
 Source4:      %{origname}-init.el
 
-License:      GPL
+License:      GPLv2+
 Group:        Applications/Editors/Emacs
-URL:          http://luaforge.net/projects/lua-mode/
+URL:          http://immerrr.github.io/lua-mode/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-root
 BuildArch:    noarch
 
-BuildRequires:     unzip
+BuildRequires: unzip
 
 Requires:     emacsen
 Requires(post):       emacsen
@@ -39,7 +39,8 @@ lua-mode は Lua ファイルを編集するための Emacs メジャーモー
 
 %prep
 
-%setup -q -c %{origname}-%{origver}
+%setup -q
+#-c %{origname}-%{origver}
 
 %build
 
@@ -97,12 +98,15 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc README README.md TODO
+%doc NEWS README README.md TODO
 %{_datadir}/emacs/site-lisp/%{origname}
 %{emacsen_pkgdir}/install/%{origname}
 %{emacsen_pkgdir}/remove/%{origname}
 
 
 %changelog
+* Fri Apr 17 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 20140514-1
+- new upstream release
+
 * Thu Apr 14 2011 Munehiro Yamamoto <munepi@vinelinux.org> 20110324-1
 - first release for Vine Linux

m/migemo/migemo-vl.spec

@@ -2,8 +2,8 @@
 %define   _noVersionedDependencies        1
 %define   prereq_ge()   %(LC_ALL="C" rpm -q --queryformat 'Requires(post):%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
 %define   origname      migemo
-%define   origver       0.40
-%define   release       6%{?_dist_release}
+%define   origver       1.9.1
+%define   release       1%{?_dist_release}
 
 Name:     %{origname}
 Version:  %{origver}
@@ -11,22 +11,22 @@ Release:  %{release}
 
 Summary: Japanese incremental search with Romaji on Emacsen
 Summary(ja): Emacsen 上でローマ字を使って日本語インクリメントサーチを行うツール
-License: GPLv2
+License: GPLv2+
 Group: Applications/Editors/Emacs
-Source0: http://0xcc.net/migemo/migemo-%{origver}.tar.gz
+URL: http://0xcc.net/migemo/
+
+Source0: https://github.com/emacs-jp/migemo/archive/%{version}.tar.gz
 Source1: migemo-install.sh
 Source2: migemo-remove.sh
 Source3: vine-default-migemo.el
 Source4: migemo-init.el
-Patch0: migemo-el_debian.patch
-URL: http://0xcc.net/migemo/
+
 BuildArch: noarch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: emacsen
 Requires: cmigemo
 Requires: emacsen
 Requires: apel
-#Requires: ruby >= %{rubyver}
 Requires(post): emacsen
 Requires(preun): emacsen
 %prereq_ge emacsen-common
@@ -35,11 +35,11 @@ Requires(preun): emacsen
 Japanese incremental search with Romaji on Emacsen
 
 %description -l ja
-Emacsen 上でローマ字を使って日本語インクリメントサーチを行うツール
+Emacsen 上でローマ字を使って日本語インクリメントサーチを行うツールです。
 
 %prep
 %setup -q -n %{origname}-%{origver}
-%patch0 -p 1 -b .debian
+#patch0 -p 1 -b .debian
 
 %build
 
@@ -51,10 +51,8 @@ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/%{origname}
 mkdir -p ${RPM_BUILD_ROOT}%{emacsen_pkgdir}/install
 mkdir -p ${RPM_BUILD_ROOT}%{emacsen_pkgdir}/remove
 
-%{__cp} -a migemo.el.in \
-      ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/%{origname}/migemo.el
-%{__cp} -a %{SOURCE3} %{SOURCE4} \
-      ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/%{origname}
+install -m644 migemo.el %{SOURCE3} %{SOURCE4} \
+      $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/%{origname}
 
 #
 # install  script( bytecompile el and install elc , remove )   
@@ -95,12 +93,15 @@ rm -rf ${RPM_BUILD_DIR}/%{origname}-%{origver}
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
+%doc README.md images/migemo.png
 %{_datadir}/emacs/site-lisp/%{origname}
 %{emacsen_pkgdir}/install/%{origname}
 %{emacsen_pkgdir}/remove/%{origname}
 
 %changelog
+* Fri Apr 17 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.9.1-1
+- updated to 1.9.1
+
 * Fri Dec 14 2012 IWAI, Masaharu <iwai@alib.jp> 0.40-6
 - update migemo-install.sh (Source1)
 

p/php-mode/php-mode-vl.spec

@@ -1,20 +1,20 @@
 %define       _noVersionedDependencies        1
-%define       prereq_ge()   %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
+%define       prereq_ge()   %(LC_ALL="C" rpm -q --queryformat 'Requires(pre):%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
 %define       emacsen_pkgdir /usr/lib/emacsen-common/packages
 %define       origname      php-mode
-%define       origver       1.5.0
-%define       release       2%{?_dist_release}
+%define       origver       1.15.3
 
-Summary: PHP-mode for Emacsen
-Name: %{origname}
-Version: %{origver}
-Release: %{release}
+Name: 		%{origname}
+Version: 	%{origver}
+Release: 	1%{?_dist_release}
+Summary: 	PHP-mode for Emacsen
+Summary(ja): 	Emacs 用 PHP モード
 
-Group: Applications/Editors/Emacs
-License: GPL
-URL: http://sourceforge.net/projects/php-mode/
+Group: 		Applications/Editors/Emacs
+License: 	GPLv3
+URL: 		http://sourceforge.net/projects/php-mode/
 
-Source0: http://prdownloads.sourceforge.net/php-mode/php-mode-%{version}.tar.gz
+Source0: https://github.com/ejmr/php-mode/archive/v%{version}.tar.gz
 Source1: %{origname}-install.sh
 Source2: %{origname}-remove.sh
 Source3: vine-default-php-mode.el
@@ -22,9 +22,9 @@ Source4: php-mode-init.el
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
+
 Requires(post): emacsen
-Requires:       emacsen texinfo
-#Requires:     speedbar
+Requires:       emacsen
 %prereq_ge emacsen-common
 
 %description
@@ -34,7 +34,9 @@ Imenu and SpeedBar; Customization options
 
 %prep
 %setup -q
-makeinfo php-mode.texi
+
+%build
+#makeinfo php-mode.texi
 
 %install
 [ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
@@ -43,9 +45,9 @@ makeinfo php-mode.texi
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/%{origname}
 mkdir -p $RPM_BUILD_ROOT/%{emacsen_pkgdir}/install
 mkdir -p $RPM_BUILD_ROOT/%{emacsen_pkgdir}/remove
-mkdir -p $RPM_BUILD_ROOT/%{_infodir}
+#mkdir -p $RPM_BUILD_ROOT/%{_infodir}
 
-install -m 0644 php-mode.info $RPM_BUILD_ROOT/%{_infodir}
+#install -m 0644 php-mode.info $RPM_BUILD_ROOT/%{_infodir}
 
 ###
 # install el files
@@ -85,8 +87,8 @@ rm -rf ${RPM_BUILD_DIR}/%{origname}-%{origver}
 
 %files
 %defattr(-,root,root)
-%doc fdl.texi ChangeLog
-%{_infodir}/php-mode.info*
+%doc Changelog.md LICENSE README.md
+#{_infodir}/php-mode.info*
 %{_datadir}/emacs/site-lisp/%{origname}/
 #%{_libdir}/emacsen-common/packages/install/%{origname}
 #%{_libdir}/emacsen-common/packages/remove/%{origname}
@@ -94,6 +96,9 @@ rm -rf ${RPM_BUILD_DIR}/%{origname}-%{origver}
 %{emacsen_pkgdir}/remove/%{origname}
 
 %changelog
+* Fri Apr 17 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.15.3-1
+- updated to 1.15.3
+
 * Mon Oct 18 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.5.0-2
 - used: Requires(post) instead of Prereq
 

p/po-mode/po-mode-vl.spec

@@ -1,14 +1,15 @@
 %define origname       po-mode
 
 Summary: Emacs Lisp for editing po file of gettext
-Summary(ja): gettextの po ファイルを編集するためのEmacs Lisp
+Summary(ja): gettextの po ファイルを編集するための Emacs Lisp
 Name: po-mode
-Version: 0.18.1.1
+Version: 0.19.4
 Release: 1%{?_dist_release}
 License: GPLv3 and LGPLv2+
 Group: Applications/Editors/Emacs
-Source: ftp://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz
 URL: http://www.gnu.org/software/gettext/
+
+Source: ftp://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz
 Source1: po-mode-init.el
 Source3: %{origname}-install.sh
 Source4: %{origname}-remove.sh
@@ -92,6 +93,9 @@ fi
 
 
 %changelog
+* Fri Apr 17 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.19,4-1
+- new upstream release
+
 * Fri Apr 22 2011 IWAI, Masaharu <iwai@alib.jp> 0.18.1.1-1
 - new upstream release
 - drop using forward-line patch (Patch0): upstream fixed

x/xfdashboard/xfdashboard-vl.spec

@@ -11,7 +11,7 @@ URL:		http://xfdashboard.froevel.de
 Source0:	http://archive.xfce.org/src/apps/%{name}/0.4/%{name}-%{version}.tar.bz2
 
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	libwnck-devel >= 2.30
+BuildRequires:	libwnck3-devel
 BuildRequires:	clutter-devel >= 1.12
 BuildRequires:	xfconf-devel >= 2.32
 BuildRequires:	garcon-devel >= 0.2.0