Browse Source

2014-10-03 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* util-linux: updated summary and group
	* zziplib: updated
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8995 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
a6c3361a0f
2 changed files with 46 additions and 17 deletions
  1. 30 14
      u/util-linux/util-linux-vl.spec
  2. 16 3
      z/zziplib/zziplib-vl.spec

+ 30 - 14
u/util-linux/util-linux-vl.spec

@@ -3,7 +3,7 @@ Summary: A collection of basic system utilities
 Summary(ja): 基本システムユーティリティー集
 Name: util-linux
 Version: 2.22.2
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: http://en.wikipedia.org/wiki/Util-linux
@@ -105,8 +105,8 @@ Conflicts: SysVinit-tools < 2.88dsf-2
 
 Requires(preun): /sbin/install-info
 Requires(post): /sbin/install-info
-Requires(post): coreutils
 Requires(pre): coreutils
+Requires(post): coreutils
 Requires: pam >= 0.66-4, /etc/pam.d/system-auth
 Requires: libuuid = %{version}-%{release}
 Requires: libblkid = %{version}-%{release}
@@ -177,7 +177,8 @@ Util-linux パッケージは Linux システムが機能するために必要
 
 %package -n libmount
 Summary: Device mounting library
-Group: Development/Libraries
+Summary(ja): デバイスマウントライブラリ
+Group: System Environment/Libraries
 License: LGPLv2+
 Requires: libblkid = %{version}-%{release}
 
@@ -186,7 +187,8 @@ This is the device mounting library, part of util-linux.
 
 
 %package -n libmount-devel
-Summary: Device mounting library
+Summary: Development files for device mounting library
+Summary(ja): デバイスマウントライブラリの開発用ファイル
 Group: Development/Libraries
 License: LGPLv2+
 Requires: libmount = %{version}-%{release}
@@ -199,7 +201,8 @@ part of util-linux.
 
 %package -n libblkid
 Summary: Block device ID library
-Group: Development/Libraries
+Summary(ja): ブロックデバイス識別ライブラリ
+Group: System Environment/Libraries
 License: LGPLv2+
 
 %description -n libblkid
@@ -207,7 +210,8 @@ This is block device identification library, part of util-linux-ng.
 
 
 %package -n libblkid-devel
-Summary: Block device ID library
+Summary: Development files for block device ID library
+Summary(ja): ブロックデバイス識別ライブラリの開発用ファイル
 Group: Development/Libraries
 License: LGPLv2+
 Provides: libblkid-static = %{version}-%{release}
@@ -221,7 +225,8 @@ part of util-linux-ng.
 
 %package -n libuuid
 Summary: Universally unique ID library
-Group: Development/Libraries
+Summary(ja): UUID ライブラリ
+Group: System Environment/Libraries
 License: BSD
 
 %description -n libuuid
@@ -237,7 +242,8 @@ across a network.
 See also the "uuid" package, which is a separate implementation.
 
 %package -n libuuid-devel
-Summary: Universally unique ID library
+Summary: Development files for universally unique ID library
+Summary(ja): UUID ライブラリの開発用ファイル
 Group: Development/Libraries
 License: BSD
 Provides: libuuid-static = %{version}-%{release}
@@ -260,6 +266,7 @@ See also the "uuid-devel" package, which is a separate implementation.
 
 %package -n uuidd
 Summary: Helper daemon to guarantee uniqueness of time-based UUIDs
+Summary(ja): 時系列 UUID の唯一性を保証するためのヘルパーデーモン
 Group: System Environment/Daemons
 Requires: libuuid = %{version}-%{release}
 License: GPLv2
@@ -275,7 +282,8 @@ SMP systems.
 # compat32
 %package -n compat32-libmount
 Summary: Device mounting library
-Group: Development/Libraries
+Summary(ja): デバイスマウントライブラリ
+Group: System Environment/Libraries
 License: LGPLv2+
 Requires: libmount = %{version}-%{release}
 
@@ -284,7 +292,8 @@ This is the device mounting library, part of util-linux.
 
 
 %package -n compat32-libmount-devel
-Summary: Device mounting library
+Summary: Development files for device mounting library
+Summary(ja): デバイスマウントライブラリの開発用ファイル
 Group: Development/Libraries
 License: LGPLv2+
 Requires: libmount = %{version}-%{release}
@@ -298,7 +307,8 @@ part of util-linux.
 
 %package -n compat32-libuuid
 Summary: Universally unique ID library
-Group: Development/Libraries
+Summary(ja): UUID ライブラリ
+Group: System Environment/Libraries
 Requires: libuuid = %{version}-%{release}
 License: BSD
 
@@ -314,7 +324,8 @@ across a network.
 
 
 %package -n compat32-libuuid-devel
-Summary: Universally unique ID library
+Summary: Development files for universally unique ID library
+Summary(ja): UUID ライブラリの開発用ファイル
 Group: Development/Libraries
 License: BSD
 Requires: libuuid-devel = %{version}-%{release}
@@ -877,12 +888,12 @@ fi
 
 %files -n libmount
 %defattr(-,root,root)
-%doc shlibs/mount/COPYING.libmount
+%doc libmount/COPYING
 /%{_lib}/libmount.so.*
 
 %files -n libmount-devel
 %defattr(-,root,root)
-%doc shlibs/mount/COPYING.libmount
+%doc libmount/COPYING
 %{_libdir}/libmount.a
 %{_libdir}/libmount.so
 %{_includedir}/libmount
@@ -951,6 +962,11 @@ fi
 %endif
 
 %changelog
+* Thu Oct  2 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.22.2-3
+- updated Summary
+- fixed %doc to include libmount COPYING
+- library subpackages are moved to System Environment/Libraries Group
+
 * Tue Jun 17 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.22.2-2
 - change BuildRequires: eudev-libudev-devel instead of libudev-devel
 

+ 16 - 3
z/zziplib/zziplib-vl.spec

@@ -1,12 +1,15 @@
-Summary: Lightweight library to easily extract data from zip files
 Name: zziplib
-Version: 0.13.59
+Summary: Lightweight library to easily extract data from zip files
+Version: 0.13.62
 Release: 1%{?_dist_release}
 License: LGPLv2+ or MPLv1.1
-Group: Applications/Archiving
+Group: System Environment/Libraries
 URL: http://zziplib.sourceforge.net/
+
 Source: http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2
 Patch0: zziplib-0.13.59-multilib.patch
+Patch1: zziplib-0.13.62-xmlto.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: perl
 BuildRequires: python
@@ -63,6 +66,10 @@ zziplib library.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+
+autoreconf -f -i
+
 # Save the common patched _config.h file to overwrite the generated one
 %{__cp} -a zzip/_config.h _config.h
 
@@ -81,6 +88,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
+
 # Overwrite the platform specific _config.h with our own modified common one
 %{__rm} -f %{buildroot}%{_includedir}/zzip/_config.h
 %{__install} -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h
@@ -116,6 +124,11 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' */libtool
 
 
 %changelog
+* Thu Oct 02 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 0.13.62-1
+- updated to 0.13.62
+- added Patch1 to build xmlto-0.0.26
+- moved main package to System Environment/Libraries Group
+
 * Fri Apr 01 2011 Munehiro Yamamoto <munepi@vinelinux.org> - 0.13.59-1
 - initial build based on Fedora rawhide