Browse Source

updated 4 packages

bash-completion-2.11-1

hicolor-icon-theme-0.17-1

spawn-fcgi-1.6.4-1

xdg-user-dirs-0.17-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12562 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 3 years ago
parent
commit
88b8908b28

+ 42 - 27
b/bash-completion/bash-completion-vl.spec

@@ -1,24 +1,22 @@
 Name:		bash-completion
-Version:	2.7
-Release:	2%{?_dist_release}
-License:	GPLv2+
-Group:		System Environment/Shells
-URL:            http://bash-completion.alioth.debian.org/
-Source0:	%{name}-%{version}.tar.xz
-Source3:	%{name}-2.0-redefine_filedir.bash
-Patch0:		%{name}-1.99-noblacklist.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+Summary:	Programmable completion for Bash
+Summary(ja):	bash のプログラム可能な補完拡張
+Version:	2.11
+Release:	1%{?_dist_release}
+Group:		system
 Distribution:	Vine Linux
 Vendor:		Project Vine
-Packager:	TANAKA hiroaki<mosaicist@jcom.home.ne.jp
 
-Summary:	Programmable completion for Bash
-Summary(ja):	bash のプログラム可能な補完拡張
+License:	GPLv2+
+URL:		https://github.com/scop/bash-completion
+Source0:	https://github.com/scop/bash-completion/releases/download/%{version}/bash-completion-%{version}.tar.xz
+Patch0:		%{name}-1.99-noblacklist.patch
+# patch for apt-rpm
+Patch1000:	bash-completion-2.11-apt-cache.patch
 
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildArch:      noarch
 
-# Dependency
-
 %description
 bash-completion is a collection of shell functions that take advantage of
 the programmable completion feature of bash.
@@ -34,41 +32,58 @@ bash-completion は bash のプログラム可能な補完機能を利用し、
 %prep
 %setup -q
 %patch0 -p1
+%patch1000 -p1
 
 
 %build
+autoreconf -fiv
 %configure
 %{__make} %{?_smp_mflags}
 
+cat <<EOF >redefine_filedir
+# This is a copy of the _filedir function in bash_completion, included
+# and (re)defined separately here because some versions of Adobe
+# Reader, if installed, are known to override this function with an
+# incompatible version, causing various problems.
+#
+# https://bugzilla.redhat.com/677446
+# http://forums.adobe.com/thread/745833
+ 
+EOF
+sed -ne '/^_filedir\s*(/,/^}/p' bash_completion >>redefine_filedir
 
-%install
-%{__rm} -rf ${RPM_BUILD_ROOT}
-%{__make} install DESTDIR=${RPM_BUILD_ROOT}
 
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
+install -Dpm 644 redefine_filedir \
+    %{buildroot}%{_sysconfdir}/bash_completion.d/redefine_filedir
+ 
 #remove for vine
-rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/{cowsay,cowthink}
-%if "%{?_dist_release}" >= "vl7"
-if [ -f $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/nmcli ]; then
-   rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/nmcli
-fi 
-%endif
+rm %{buildroot}%{_datadir}/bash-completion/completions/{cowsay,cowthink}
 
-install -Dpm 644 %{SOURCE3} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/redefine_filedir
 
 %clean
-%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf %{buildroot}
 
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING doc/*.txt
+%license COPYING
+%doc AUTHORS README.md doc/*.txt
 %config %{_sysconfdir}/profile.d/bash_completion.sh
 %{_sysconfdir}/bash_completion.d/
 %{_datadir}/bash-completion/
 %{_datadir}/pkgconfig/bash-completion.pc
+%{_datadir}/cmake/bash-completion
+
 
 %changelog
+* Wed Mar 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.11-1
+- new upstream release.
+- dropped Source3.
+- added Patch3 for apt-rpm.
+
 * Fri Oct  6 2017 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.7-2
 - new upstream release
   (2.7-1 was used for vl6)

+ 22 - 12
h/hicolor-icon-theme/hicolor-icon-theme-vl.spec

@@ -1,21 +1,21 @@
 Summary: Basic requirement for icon themes
 Summary(ja): アイコンテーマの基本ファイル
 Name: hicolor-icon-theme
-Version: 0.12
-Release: 3%{?_dist_release}
+Version: 0.17
+Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke, inagaki
+
 License: GPL
-Group: User Interface/Desktops
-URL: http://freedesktop.org/Software/icon-theme
-Source0: http://icon-theme.freedesktop.org/releases/%{name}-%{version}.tar.gz
-Conflicts: kdelibs <= 3.2.3-0vl1
-Requires(post): coreutils, gtk2
+URL: https://freedesktop.org/wiki/Software/icon-theme/
+Source0: http://icon-theme.freedesktop.org/releases/%{name}-%{version}.tar.xz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke, inagaki
+Conflicts: kdelibs <= 3.2.3-0vl1
+Requires(post): coreutils, gtk2
 
 %description
 Contains the basic directories and files needed for icon theme support.
@@ -23,20 +23,25 @@ Contains the basic directories and files needed for icon theme support.
 %description -l ja
 アイコンテーマサポートに必要な基本ディレクトリおよびファイルが含まれています。
 
+
 %prep
 %setup -q
 
+
 %build
 %configure
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 #make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} install
 %makeinstall
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
@@ -50,10 +55,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 %files
 %defattr(-,root,root,-)
-%doc README COPYING
+%license COPYING
+%doc README
 %{_datadir}/icons/hicolor
 
+
 %changelog
+* Wed Mar 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.17-1
+- new upstream release.
+
 * Mon Dec 30 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.12-3
 - rebuild with VineSeed environment
 

+ 26 - 7
s/spawn-fcgi/spawn-fcgi-vl.spec

@@ -1,14 +1,21 @@
 Summary:	Spawn fcgi-process directly
 Summary(ja):    fcgi プロセスを直接起動
 Name:		spawn-fcgi
-Version:	1.6.3
-Release:	3%{?_dist_release}
+Version:	1.6.4
+Release:	1%{?_dist_release}
+Group:		servers
+
 License:	BSD
-Group:		System Environment/Daemons
-Source0:	http://www.lighttpd.net/download/%{name}-%{version}.tar.bz2
-URL:		http://redmine.lighttpd.net/projects/spawn-fcgi
+URL:		https://redmine.lighttpd.net/projects/spawn-fcgi
+%global		shortver %(echo %{version} | cut -d . -f 1-2)
+Source0:	https://download.lighttpd.net/spawn-fcgi/releases-%{shortver}.x/spawn-fcgi-%{version}.tar.xz
+Patch0:		spawn-fcgi-warnings.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
+
+%debug_package
+
+
 %description
 spawn-fcgi is used to spawn fcgi-process directly without the help of
 a webserver or the programm itself.
@@ -17,28 +24,40 @@ a webserver or the programm itself.
 spawm-fcgi は fcgi プロセスを webサーバやプログラムそのものの助けを
 借りずに直接起動するためのソフトウエアです。
 
+
 %prep
-%setup -q
+%autosetup -p1
+
 
 %build
+autoreconf -ivf
 %configure
 %{__make}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING NEWS README
+%license README
+%doc AUTHORS COPYING NEWS
 %attr(755,root,root) %{_bindir}/spawn-fcgi
 %{_mandir}/man1/spawn-fcgi.1*
 
+
 %changelog
+* Wed Mar 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.4-1
+- new upstream release.
+- imported Patch0 from upstream.
+
 * Mon Jan 13 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.3-3
 - rebuilt with current environment.
 

+ 36 - 16
x/xdg-user-dirs/xdg-user-dirs-vl.spec

@@ -1,19 +1,20 @@
 Summary:	Handles user special directories
 Summary(ja):	ユーザー用の特別なディレクトリの設定
 Name:		xdg-user-dirs
-Version:	0.14
+Version:	0.17
 Release:	1%{?_dist_release}
-Source0:	http://www.gnome.org/~alexl/%{name}-%{version}.tar.gz
-Source1:	xdg-user-dirs.sh
-Patch0:		xdg-user-dirs_update-ja.po.patch
-License:	GPL
 Group:		User Interface/Desktops
-URL:		http://freedesktop.org/wiki/Software/xdg-user-dirs
 
-## Requires:	%{_sysconfdir}/X11/xinit/xinitrc.d
-Requires:	xorg-x11-xinit
-BuildRequires:	gettext
+License:	GPL
+URL:		https://freedesktop.org/wiki/Software/xdg-user-dirs
+Source0:	https://user-dirs.freedesktop.org/releases/%{name}-%{version}.tar.gz
+Source1:	xdg-user-dirs.sh
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRequires:	gettext
+BuildRequires:  docbook-style-xsl
+BuildRequires:  libxslt
+Requires:      %{_sysconfdir}/xdg/autostart
 
 %description
 Contains xdg-user-dirs-update that updates folders in a users
@@ -24,39 +25,58 @@ homedirectory based on the defaults configured by the administrator.
 にある特別なフォルダの名前を更新する xdg-user-dirs-update コマンドを含
 んでいます。
 
+
+%debug_package
+
+
 %prep
 %setup -q
-%patch0 -p1 -b .update
+pushd po
+sed -i \
+	-e 's/映画/ムービー/' \
+	-e 's/音楽/ミュージック/' \
+	-e 's/画像/ピクチャー/' \
+	ja.po
+popd
+
 
 %build
 %configure
 %{__make} %{?_smp_mflags}
-# compile ja.po
+
 pushd po
-  msgfmt ja.po -o ja.gmo
+touch *.po
+make update-gmo
 popd
 
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__make} install DESTDIR=${RPM_BUILD_ROOT}
-%{__mkdir} -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinitrc.d
-%{__install} -p -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/X11/xinit/xinitrc.d
 
 %find_lang %{name}
 
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc NEWS AUTHORS README ChangeLog COPYING
+%license COPYING
+%doc NEWS AUTHORS README
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/xdg/user-dirs.conf
 %config(noreplace) %{_sysconfdir}/xdg/user-dirs.defaults
-%{_sysconfdir}/X11/xinit/xinitrc.d/*
+%{_sysconfdir}/xdg/autostart/*
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+
 
 %changelog
+* Wed Mar 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.17-1
+- new upstream release.
+- dropped Patch0: got same effects by sed.
+
 * Wed Jun 27 2012 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.14-1
 - new upstream release