Przeglądaj źródła

updated 4 packages

brotli-1.0.9-1

dialog-1.3-1.svn20200327

logwatch-7.5.4-0

vim-8.2.1712-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12498 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 3 lat temu
rodzic
commit
b7fdac7470
4 zmienionych plików z 115 dodań i 70 usunięć
  1. 8 2
      b/brotli/brotli-vl.spec
  2. 18 17
      d/dialog/dialog-vl.spec
  3. 13 8
      l/logwatch/logwatch-vl.spec
  4. 76 43
      v/vim/vim-vl.spec

+ 8 - 2
b/brotli/brotli-vl.spec

@@ -3,8 +3,8 @@
 Summary:        Lossless compression algorithm
 Summary(ja):    ロスレス圧縮アルゴリズム
 Name:           brotli
-Version:        1.0.7
-Release:        5%{?_dist_release}
+Version:        1.0.9
+Release:        1%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -53,6 +53,9 @@ It is similar in speed with deflate but offers more dense compression.
 This package installs the development files
 
 
+%debug_package
+
+
 %prep
 %autosetup
 # fix permissions for -debuginfo
@@ -121,6 +124,9 @@ cd ..
 
 
 %changelog
+* Tue Sep 22 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.9-1
+- nre upstream release.
+
 * Mon Aug 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.7-5
 - rebuilt with python-3.8.
 

+ 18 - 17
d/dialog/dialog-vl.spec

@@ -1,24 +1,22 @@
 Summary:	A utility for creating TTY dialog boxes.
 Summary(ja):	TTY ダイアログボックスのユーティリティ
 Name:		dialog
-%define		SubVersion 20110707
-Version:	1.1
+%define		SubVersion 20200327
+Version:	1.3
 Release:	1.svn%{SubVersion}%{?_dist_release}
+Group:		system
+Vendor:		Project Vine
+Distribution:	Vine Linux
+
 License:	LGPLv2
-Group:		Applications/System
-URL:		http://invisible-island.net/dialog/dialog.html
-Source:		ftp://invisible-island.net/dialog/dialog-1.1-%{SubVersion}.tgz
-Patch1:		dialog-incdir.patch
+URL:		https://invisible-island.net/dialog/
+Source:		https://invisible-mirror.net/archives/dialog/dialog-%{version}-%{SubVersion}.tgz
 Patch2:		dialog-multilib.patch
 Patch3:		dialog-libs.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	ncurses-devel, gettext findutils libtool
 Requires:	ncurses
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
-
-
 %description
 Dialog is a utility that allows you to show dialog boxes (containing
 questions or messages) in TTY (text mode) interfaces.  Dialog is called
@@ -28,7 +26,6 @@ gauge.
 
 Install dialog if you would like to create TTY dialog boxes.
 
-
 %description -l ja
 Dialog は TTY (テキストモード) インタフェース上に、質問やメッセージを
 含むダイアログボックスを表示するユーティリティです。
@@ -43,7 +40,7 @@ TTY ダイアログボックスを作成したければ dialog をインスト
 %package devel 
 Summary: Development files for building applications with the dialog library
 Summary(ja): Dialog ライブラリ用開発ファイル
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release} ncurses-devel
 
 %description devel
@@ -52,7 +49,6 @@ questions or messages) in TTY (text mode) interfaces. This package
 contains the files needed for developing applications, which use the 
 dialog library.
 
-
 %description devel -l ja
 Dialog は TTY (テキストモード) インタフェース上に、質問やメッセージを
 含むダイアログボックスを表示するユーティリティです。
@@ -60,12 +56,15 @@ Dialog は TTY (テキストモード) インタフェース上に、質問や
 必要なファイルが収録されています。
 
 
+%debug_package
+
+
 %prep
 %setup -q -n dialog-%{version}-%{SubVersion}
-%patch1 -p1 -b .incdir
 %patch2 -p1 -b .multilib
 %patch3 -p1 -b .libs
 
+
 %build
 %configure \
 	--enable-nls \
@@ -98,14 +97,13 @@ rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
-
-
 %postun -p /sbin/ldconfig
 
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc COPYING dialog.lsm README _samples/samples
+%license COPYING
+%doc dialog.lsm README _samples/samples
 %{_bindir}/dialog
 %{_libdir}/libdialog.so.*
 %{_mandir}/man1/dialog.*
@@ -120,6 +118,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 21 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.3-1.svn20200327
+- new upstream release.
+
 * Fri Mar 23 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.1-1.svn20110707
 - new upstream release
 - introduce -devel subpackage; sync with 1.1-15.20110707.fc17

+ 13 - 8
l/logwatch/logwatch-vl.spec

@@ -1,23 +1,22 @@
 Summary: A log file analysis program
 Summary(ja): ログファイル分析プログラム
 Name: logwatch
-Version: 7.5.2
-Release: 1%{?_dist_release}
+Version: 7.5.4
+Release: 0%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: MIT
-Group: Applications/System
 URL: http://www.logwatch.org/
-
 Source: https://downloads.sourceforge.net/project/logwatch/logwatch-%{version}/logwatch-%{version}.tar.gz
 Patch0: 0001-Added-support-for-UNCHECKED-ENCRYPTED.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildArchitectures: noarch
+BuildArch: noarch
 Requires: coreutils, grep, mailx
 Requires: perl(Date::Manip)
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 Logwatch is a customizable, pluggable log-monitoring system.  It will go
 through your logs for a given period of time and make a report in the areas
@@ -30,12 +29,15 @@ Logwatch はカスタマイズやプラグイン拡張ができるログ監視
 を作成します。簡単に利用することができ、多くのシステムでそのまま正常に
 動作します。
 
+
 %prep
 %setup -q
 %patch0 -p1
 
+
 %build
 
+
 %install
 rm -rf %{buildroot}
 
@@ -160,6 +162,9 @@ rm -rf %{buildroot}
 %doc %{_mandir}/man*/*
 
 %changelog
+* Tue Sep 22 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.5.4-1
+- new upstream release.
+
 * Fri Aug 23 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.5.2-1
 - new upstream release.
 - dropped all patches: fixed in upstream.

+ 76 - 43
v/vim/vim-vl.spec

@@ -1,7 +1,7 @@
 # version, patch version
 %define vimversion	8.2
-%define vimsrcpversion	0390
-%define vimpversion	0390
+%define vimsrcpversion	1712
+%define vimpversion	1712
 
 %define vimsubdir	vim%(echo %{vimversion} | sed -e's/\\.//')
 #define vimdir		%{vimsubdir}
@@ -21,41 +21,39 @@
 %define features_tiny	--exec-prefix=%{binprefix} --with-features=tiny --enable-multibyte --with-tlib=tinfo
 
 
-Summary:     Vi IMproved - enhanced vi editor
-Summary(ja): Vi IMproved - 改良された vi エディタ
-Name: vim
-License: Vim
-Group: Applications/Editors
-URL: https://www.vim.org/
-
+Summary:        Vi IMproved - enhanced vi editor
+Summary(ja):    Vi IMproved - 改良された vi エディタ
+Name:           vim
 %if %{vimpversion}
-Version: %{vimversion}.%{vimpversion}
+Version:        %{vimversion}.%{vimpversion}
 %else
-Version: %{vimversion}
+Version:        %{vimversion}
 %endif
-Release: 1%{?_dist_release}
-
-Distribution: Vine Linux
-Vendor: Project Vine
+Release:        1%{?_dist_release}
+Group:          accessories
+Distribution:   Vine Linux
+Vendor:         Project Vine
 
-Source0: https://github.com/vim/vim/archive/v%{vimversion}.%{vimsrcpversion}.tar.gz#/vim-%{vimversion}.%{vimsrcpversion}.tar.bz2
+License:        Vim
+URL:            https://www.vim.org/
+Source0:        https://github.com/vim/vim/archive/v%{vimversion}.%{vimsrcpversion}.tar.gz#/vim-%{vimversion}.%{vimsrcpversion}.tar.bz2
 
 # gvim desktop file
-Source100: gvim.desktop
-Source101: gvim16.png
-Source102: gvim32.png
-Source103: gvim48.png
-Source104: gvim64.png
+Source100:      gvim.desktop
+Source101:      gvim16.png
+Source102:      gvim32.png
+Source103:      gvim48.png
+Source104:      gvim64.png
 
-Source300: vimrc.ja
-Source400: format.vim
-Source401: verifyenc.vim
+Source300:      vimrc.ja
+Source400:      format.vim
+Source401:      verifyenc.vim
 
 # http://trac.vinelinux.org/wiki/SpecTemplates/PlainPackage
-Source500: template.spec.vine
+Source500:      template.spec.vine
 
-Patch2002: vim-7.0-fixkeys.patch
-Patch2003: vim-8.0-specsyntax.patch
+Patch2002:      vim-7.0-fixkeys.patch
+Patch2003:      vim-8.0-specsyntax.patch
 
 # Patches 2000 and up are patches from the base maintainer.
 # If you're as lazy as me, generate the list using
@@ -65,7 +63,6 @@ Patch2003: vim-8.0-specsyntax.patch
 
 Patch2010: xxd-locale.patch
 
-
 Patch3000: vim-7.4-syntax.patch
 Patch3002: vim-7.4-nowarnings.patch
 Patch3004: vim-7.0-rclocation.patch
@@ -112,10 +109,11 @@ VIM(VIsual editor iMproved)はviエディタ互換のエディタで,次のよ
 
 このパッケージでは最も基本的な機能を含んだVIMが提供されます.
 
+
 %package common
 Summary: Common files needed by the non-X VIM packages
 Summary(ja): 各種の VIM パッケージに必要なファイル
-Group: Applications/Editors
+Group: accessories
 Requires: gawk
 Conflicts: vim-X11 < 6.0, vim-enhanced < 6.0, vim-minimal < 6.0
 
@@ -128,10 +126,11 @@ every different configuration) such as:
   * vim-big    - big features
   * vim-huge   - huge features and Ruby/Perl/Python support
 
+
 %package man
 Summary: Man pages for the VIM editor
 Summary(ja): VIM エディタの man ページ
-Group: Applications/Documentation
+Group: documentation
 Conflicts: nvi <= 1.79_jp-18vl1, jvim <= 3.0j2.1a-0vl1
 
 %description man
@@ -140,10 +139,11 @@ This package contains man pages for the VIM editor.
 %description -l ja man
 このパッケージはVIMエディタのmanページを含んでいます.
 
+
 %package tiny
 Summary: A minimal version of the VIM editor
 Summary(ja): 最小構成の VIM エディタ
-Group: Applications/Editors
+Group: accessories
 Requires(post): alternatives
 Conflicts: nvi <= 1.79_jp-18vl1, jvim <= 3.0j2.1a-0vl1, vim-minimal
 Obsoletes: vim-minimal
@@ -169,10 +169,11 @@ VIM(VIsual editor iMproved)はviエディタ互換のエディタで,次のよ
 ケージで提供されるVIMを使うにあたってはvim-commonパッケージは必要あり
 ません.
 
+
 %package big
 Summary: VIM editor with big features
 Summary(ja): 多機能版の VIM エディタ
-Group: Applications/Editors
+Group: accessories
 Requires(post): alternatives
 Requires: vim-common = %{version}
 Obsoletes: vim-color
@@ -195,10 +196,11 @@ VIM(VIsual editor iMproved)はviエディタ互換のエディタで,次のよ
 このパッケージではvimパッケージで提供されるVIMよりも多くの機能を含んだ
 VIMを提供しています.
 
+
 %package huge
 Summary: VIM editor with huge features
 Summary(ja): 最大機能版の VIM エディタ
-Group: Applications/Editors
+Group: accessories
 Requires(post): alternatives
 Requires: vim-common = %{version}
 Requires: %(perl -le 'use Config; print $Config{archlibexp}')
@@ -224,10 +226,11 @@ VIM(VIsual editor iMproved)はviエディタ互換のエディタで,次のよ
 このパッケージではX11対応以外のほとんどすべての機能のサポートに加え,
 Ruby/Perl/Python/Luaスクリプトの実行機能までを含んでVIMを提供しています.
 
+
 %package X11
 Summary: VIM editor with X11 support
 Summary(ja): X11 対応の VIM エディタ
-Group: Applications/Editors
+Group: accessories
 Requires(post): alternatives
 Requires: vim-X11-common = %{version}
 Provides: gvim
@@ -252,10 +255,11 @@ VIM(VIsual editor iMproved)はviエディタ互換のエディタで,次のよ
 このパッケージでは最も基本的な構成のVIMにX11対応を加えたものを提供して
 います.
 
+
 %package X11-common
 Summary: The common files needed by any version of the GVIM editor
 Summary(ja): X11 対応 VIM エディタに必要な共通ファイル
-Group: Applications/Editors
+Group: accessories
 Requires: vim-common = %{version}, gtk3
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -278,10 +282,11 @@ configuration) such as:
   * vim-X11-big  - vim-bigをX対応にしたVIMパッケージ
   * vim-X11-huge - vim-hugeをX対応にしたVIMパッケージ
 
+
 %package X11-big
 Summary: VIM editor with big features and X11 support
 Summary(ja): X11 対応の多機能版 VIM エディタ
-Group: Applications/Editors
+Group: accessories
 Requires(post): alternatives
 Requires: vim-X11-common = %{version}
 Provides: gvim
@@ -304,10 +309,11 @@ VIM(VIsual editor iMproved)はviエディタ互換のエディタで,次のよ
 このパッケージではvim-X11パッケージで提供されるVIMよりも,より多くの機
 能を含んだVIMを提供しています.
 
+
 %package X11-huge
 Summary: VIM editor with huge features and X11 support
 Summary(ja): X11 対応の最大機能版 VIM エディタ
-Group: Applications/Editors
+Group: accessories
 Requires(post): alternatives
 Requires: vim-X11-common = %{version}
 Requires: %(perl -le 'use Config; print $Config{archlibexp}')
@@ -331,6 +337,10 @@ VIM(VIsual editor iMproved)はviエディタ互換のエディタで,次のよ
 このパッケージではX11対応も含めたほとんどすべての機能のサポートに加え,
 Ruby/Perl/Python/Luaスクリプトの実行機能までを含んでVIMを提供しています.
 
+
+%debug_package
+
+
 %prep
 %setup -q -b 0 -n %{vimdir}
 # fix rogue dependencies from sample code
@@ -345,7 +355,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 
 # nothing
 
-
 %patch2010 -p1
 
 %patch3000 -p1
@@ -361,10 +370,10 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch3017 -p1
 %patch3018 -p1
 
-
 %patch4000 -p1
 # %patch4010 -p1
 
+
 %build
 cd src
 autoconf
@@ -427,6 +436,7 @@ sed -i -e 's|$VIM/vimrc|/etc/vimrc.tiny|g' os_unix.h
  make %{?_smp_mflags})
 cp os_unix.h.orig os_unix.h
 
+
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}
@@ -485,6 +495,7 @@ cd ../..
 # remove international manuals
 rm -rf %{buildroot}/%{_mandir}/{fr,it,ru,pl}*
 
+
 %post tiny
 update-alternatives \
   --install /bin/vi      vi      /bin/vim.tiny 20 \
@@ -670,9 +681,11 @@ fi
 %postun X11-common
 %{_bindir}/update-desktop-database %{_datadir}/applications >& /dev/null ||:
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root)
 %{_bindir}/vim.normal
@@ -715,13 +728,28 @@ rm -rf %{buildroot}
 %{_mandir}/ja/man1/vimdiff.1.gz
 %{_mandir}/ja/man1/vimtutor.1.gz
 %{_mandir}/ja/man1/xxd.1.gz
-%{_mandir}/da.ISO8859-1
-%{_mandir}/da.UTF-8
+%dir %{_mandir}/da.ISO8859-1
+%dir %{_mandir}/da.ISO8859-1/man*
+%{_mandir}/da.ISO8859-1/man*/*
+%dir %{_mandir}/da.UTF-8
+%dir %{_mandir}/da.UTF-8/man*
+%{_mandir}/da.UTF-8/man*/*
+%dir %{_mandir}/de.ISO8859-1
+%dir %{_mandir}/de.ISO8859-1/man*
+%{_mandir}/de.ISO8859-1/man*/*
+%dir %{_mandir}/de.UTF-8
+%dir %{_mandir}/de.UTF-8/man*
+%{_mandir}/de.UTF-8/man*/*
+%dir %{_mandir}/tr.ISO8859-9
+%dir %{_mandir}/tr.ISO8859-9/man*
+%{_mandir}/tr.ISO8859-9/man*/*
+%dir %{_mandir}/tr.UTF-8
+%dir %{_mandir}/tr.UTF-8/man*
+%{_mandir}/tr.UTF-8/man*/*
 
 %exclude %{_mandir}/da
-%exclude %{_mandir}/de.ISO8859-1
-%exclude %{_mandir}/de.UTF-8
 %exclude %{_mandir}/de
+%exclude %{_mandir}/tr
 
 %files X11-common
 %defattr(-,root,root)
@@ -758,7 +786,12 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %{_bindir}/vim.X11-huge
 
+
 %changelog
+* Mon Sep 21 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2.1712-1
+- new upstream release.
+- updated Patch3007 and 3017.
+
 * Mon Mar 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2.0390-1
 - new upstream release.
 - built with ruby-2.6.5.