Browse Source

updated 7 packages

btrfs-progs-5.4.1-1

gsm-1.0.18-1

lzo-2.10-2

libusb1-1.0.23-1

usbutils-012-1

wireless-tools-29-5

zlib-1.2.11-3

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

+ 17 - 14
b/btrfs-progs/btrfs-progs-vl.spec

@@ -1,5 +1,5 @@
 Name:           btrfs-progs
-Version:        4.3.1
+Version:        5.4.1
 Release:        1%{?_dist_release}
 Summary:        Userspace programs for btrfs
 Summary(ja):    btrfs ファイルシステム用ユーザスペースプログラム集
@@ -19,6 +19,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  autoconf, automake
 BuildRequires:  e2fsprogs-devel, libuuid-devel, zlib-devel
 BuildRequires:  libacl-devel, libblkid-devel, lzo-devel
+BuildRequires:  libzstd-devel
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
 BuildRequires:  asciidoc, xmlto
 
 %define _sbindir /sbin
@@ -72,29 +75,29 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING
-%{_libdir}/libbtrfs.so.0*
-%{_sbindir}/btrfsck
-%{_sbindir}/fsck.btrfs
-%{_sbindir}/mkfs.btrfs
-%{_sbindir}/btrfs-debug-tree
-%{_sbindir}/btrfs-image
+%license COPYING
+%{_libdir}/libbtrfs*.so.*
+%{_sbindir}/btrfs
 %{_sbindir}/btrfs-convert
+%{_sbindir}/btrfs-find-root
+%{_sbindir}/btrfs-image
+%{_sbindir}/btrfs-map-logical
 %{_sbindir}/btrfs-select-super
+%{_sbindir}/btrfsck
 %{_sbindir}/btrfstune
-%{_sbindir}/btrfs
-%{_sbindir}/btrfs-map-logical
-%{_sbindir}/btrfs-zero-log
-%{_sbindir}/btrfs-find-root
-%{_sbindir}/btrfs-show-super
+%{_sbindir}/fsck.btrfs
+%{_sbindir}/mkfs.btrfs
 %{_mandir}/man5/*.gz
 %{_mandir}/man8/*.gz
 
 %files devel
 %{_includedir}/*
-%{_libdir}/libbtrfs.so
+%{_libdir}/libbtrfs*.so
 
 %changelog
+* Sun Mar 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.4.1-1
+- new upstream release.
+
 * Sun Dec 13 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 4.3.1-1
 - new upstream release.
 

+ 47 - 31
g/gsm/gsm-vl.spec

@@ -3,24 +3,27 @@
 Summary:        Shared libraries for GSM speech compressor
 
 Name:           gsm
-Version:        1.0.14
+Version:        1.0.18
 Release:        1%{?_dist_release}
-
 Group:          System Environment/Libraries
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
 License:        MIT
 URL:            http://www.quut.com/gsm/
-
 Source:         http://www.quut.com/gsm/%{name}-%{version}.tar.gz
-Patch0:         %{name}-makefile.patch
-Patch1:         %{name}-1.0.14-warnings.patch
-Patch2:         %{name}-64bit.patch
+Patch0:         gsm-makefile.patch
+Patch1:         gsm-warnings.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-%define srcver 1.0-pl14
-%define soname 1.0.12
+%global shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
+%global majorver %(echo %{shortver} | sed -e 's/\.[0-9]*$//')
+%global minorver %(echo %{shortver} | sed -e 's/^[0-9]*\.//')
+%global patchlevel %(echo %{version} | sed -e 's/^[0-9]*\.[0-9]*\.//')
+
+%define srcver %{shortver}-pl%{patchlevel}
+%define soname %{version}
 
-Vendor: Project Vine
-Distribution: Vine Linux
 
 %description
 Contains runtime shared libraries for libgsm, an implementation of
@@ -102,45 +105,50 @@ full-rate speech transcoding, prI-ETS 300 036, which uses RPE/LTP
 
 %prep
 %setup -n gsm-%{srcver} -q
-%patch0 -p1 -b .mk
-%patch1 -p1 -b .warn
-%patch2 -p1 -b .64bit
+%autopatch -p1
+
+perl -pi -e 's/^CCFLAGS .*$/CCFLAGS = -c %{optflags} -DNeedFunctionPrototypes=1 -Wall -Wno-comment -D_XOPEN_SOURCE=700 -D_REENTRANT -fPIC/' Makefile
+
+sed -i \
+	-e 's/@MAJORVER@/%{majorver}/' \
+	-e 's/@MINORVER@/%{minorver}/' \
+	-e 's/@PATCHLEVEL@/%{patchlevel}/' \
+	-e 's/@SOVERSION@/%{soname}/' \
+	Makefile
+
 
 %build
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC";
 make %{?_smp_mflags} all
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_includedir}/gsm
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/{man1,man3}
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_includedir}/gsm
+mkdir -p %{buildroot}%{_libdir}
+mkdir -p %{buildroot}%{_mandir}/{man1,man3}
 
 make install \
-	INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} \
-	GSM_INSTALL_INC=$RPM_BUILD_ROOT%{_includedir}/gsm \
-	GSM_INSTALL_LIB=$RPM_BUILD_ROOT%{_libdir}
-
-cp -p $RPM_BUILD_DIR/gsm-%{srcver}/lib/libgsm.so.%{soname} $RPM_BUILD_ROOT%{_libdir}
-ln -s libgsm.so.%{soname} $RPM_BUILD_ROOT%{_libdir}/libgsm.so.1
-ln -s libgsm.so.%{soname} $RPM_BUILD_ROOT%{_libdir}/libgsm.so
+        INSTALL_ROOT=%{buildroot}%{_prefix} \
+        GSM_INSTALL_INC=%{buildroot}%{_includedir}/gsm \
+        GSM_INSTALL_LIB=%{buildroot}%{_libdir}
 
 # some apps look for this in /usr/include
-ln -s gsm/gsm.h $RPM_BUILD_ROOT%{_includedir}
+ln -s gsm/gsm.h %{buildroot}%{_includedir}
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
+echo ".so toast.1" > %{buildroot}%{_mandir}/man1/tcat.1
+echo ".so toast.1" > %{buildroot}%{_mandir}/man1/untoast.1
 
 
 %check
 # This is to ensure that the patch creates the proper library version.
-[ -f $RPM_BUILD_ROOT%{_libdir}/libgsm.so.%{soname} ]
+[ -f %{buildroot}%{_libdir}/libgsm.so.%{version} ]
+export LDFLAGS="%{?__global_ldflags}"
 make addtst
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -152,7 +160,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYRIGHT MACHINES README
+%license COPYRIGHT
+%doc ChangeLog MACHINES README
 %{_libdir}/libgsm.so.*
 
 %files tools
@@ -160,6 +169,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/toast
 %{_bindir}/untoast
 %{_mandir}/man1/toast.1*
+%{_mandir}/man1/tcat.1.gz
+%{_mandir}/man1/untoast.1.gz
 
 %files devel
 %defattr(-,root,root,-)
@@ -181,6 +192,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Mar 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.18-1
+- new upstream release.
+- updated  Patch0 and 1.
+- dropped Patch2.
+
 * Sun Apr 05 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.14-1
 - new upstream release
 - update Patch1 (%%{name}-1.0.14-warnings.patch)

+ 6 - 2
l/lzo/lzo-vl.spec

@@ -4,7 +4,7 @@ Name:           lzo
 Summary:        Data compression library with very fast (de)compression
 Summary(ja):    高速なデータ圧縮ライブラリ
 Version:        2.10
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        GPLv2+
@@ -140,7 +140,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README THANKS
+%license COPYING
+%doc AUTHORS ChangeLog NEWS README THANKS
 %{_libdir}/liblzo2.so.*
 
 %files minilzo
@@ -172,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Mar 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.10-2
+- rebuilt with current environment.
+
 * Sat Dec 30 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.10-1
 - new upstream release.
 - updated Patch0.

+ 16 - 6
lib/libu/libusb1/libusb1-vl.spec

@@ -3,19 +3,24 @@
 Summary: A library which allows userspace access to USB devices
 Summary(ja): USB デバイスにユーザスペースからアクセスするためのライブラリ
 Name: libusb1
-Version: 1.0.21
+Version: 1.0.23
 Release: 1%{?_dist_release}
 Group: System Environment/Libraries
-License: LGPLv2+
-URL: http://libusb.wiki.sourceforge.net/Libusb1.0
 
-Source0: http://downloads.sourceforge.net/libusb/libusb-%{version}.tar.bz2
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: LGPLv2+
+URL: https://libusb.info/
+Source0: https://github.com/libusb/libusb/releases/download/v%{version}/libusb-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 ExcludeArch: s390 s390x
-BuildRequires: eudev-libudev-devel
+BuildRequires: libudev-devel
 BuildRequires: doxygen
 
+%global __provides_exclude_from ^%{_libdir}/pkgconfig/.*$
+
 %description
 This package provides a way for applications to access USB devices. Note that
 this library is not compatible with the original libusb-0.1 series.
@@ -30,6 +35,7 @@ Summary(ja): libusb の開発用ファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+Provides: pkgconfig(libusb-1.0) = %{version}
 
 %description devel
 This package contains the header files, libraries and documentation needed to
@@ -115,7 +121,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING README NEWS ChangeLog
+%license COPYING
+%doc AUTHORS README*
 %{_libdir}/libusb-1.0.so.*
 
 %files devel
@@ -143,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Mar 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.23-1
+- new upstream release.
+
 * Fri Jan 05 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.21-1
 - new upstream release.
 

+ 16 - 14
u/usbutils/usbutils-vl.spec

@@ -1,23 +1,22 @@
-%define name	usbutils
-%define version	008
-%define release	1%{?_dist_release}
-
 Summary:	USB related utilities.
 Summary(ja): 	USB 用ユーティリティ
-Name:		%{name}
-Version:	%{version}
-Release: 	%{release}
-Source0:	https://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.xz
-Patch1:		usbutils-008-hwdata.patch
-License:	GPLv2+
+Name:		usbutils
+Version:	012
+Release: 	1%{?_dist_release}
 Group:		Applications/System
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:	GPLv2+
 URL:		http://www.linux-usb.org/
+Source0:	https://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.xz
 
 Requires:	hwdata
 
 BuildRequires:	libtool
 BuildRequires:	libusb1-devel
-BuildRequires:	eudev-libudev-devel
+BuildRequires:	libudev-devel
 BuildRequires:	autoconf
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -35,7 +34,6 @@ connected to the USB.
 %prep
 
 %setup -q
-%patch1 -p1 -b .hwdata
 
 %build
 autoreconf -if
@@ -52,12 +50,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%license LICENSES/*
+%doc NEWS README*
 %{_mandir}/*/*
 %{_bindir}/*
-%{_datadir}/pkgconfig/usbutils.pc
-%doc AUTHORS COPYING ChangeLog NEWS README
 
 %changelog
+* Sun Mar 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 012-1
+- new upstream release.
+- dropped Patch1: fixed in upstream.
+
 * Mon May 04 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 008-1
 - update to 008
 - update Patch1 (usbutils-008-hwdata.patch)

+ 14 - 6
w/wireless-tools/wireless-tools-vl.spec

@@ -2,16 +2,18 @@ Summary:      Wireless LAN management utilities.
 Summary(ja):  無線LAN管理ユーティリティ
 Name:         wireless-tools
 Version:      29
-Release:      4%{?_dist_release}
-License:      GPL2
+Release:      5%{?_dist_release}
 Group:        System Environment/Base
-URL: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
-Source0:      http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.%{version}.tar.gz
-Buildroot:    %{_tmppath}/%{name}-%{version}-root
 
 Vendor:       Project Vine
 Distribution: Vine Linux
 
+License:      GPL2
+URL:          https://hewlettpackard.github.io/wireless-tools/Tools.html
+Source0:      https://hewlettpackard.github.io/wireless-tools/wireless_tools.%{version}.tar.gz
+Buildroot:    %{_tmppath}/%{name}-%{version}-root
+
+
 
 %description
 The wireless-tools package contain the Wireless tools, used to
@@ -38,9 +40,11 @@ Development files for Wireless-tools
 %prep
 %setup -q -n wireless_tools.%{version}
 
+sed -i -e 's/^\(XCFLAGS=.*\)$/\1 %{optflags}/' Makefile
+
 %build
 %__make clean
-%__make BUILD_SHARED=1
+%__make BUILD_SHARED=1 FORCE_WEXT_VERSION=16
 
 
 %install
@@ -60,6 +64,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
+%license COPYING
 %doc README INSTALL *.txt
 %{_syssbindir}/*
 /%{_lib}/*.so.*
@@ -71,6 +76,9 @@ rm -rf %{buildroot}
 /%{_lib}/*.so
 
 %changelog
+* Sun Mar 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 29-5
+- rebuild with current environment
+
 * Mon Jan 12 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 29-4
 - rebuild with VineSeed environment
 

+ 5 - 2
z/zlib/zlib-vl.spec

@@ -3,7 +3,7 @@ Summary: The zlib compression and decompression library.
 Summary(ja): zlib 圧縮/展開ライブラリ
 Name: zlib
 Version: 1.2.11
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 Group: System Environment/Libraries
 Source: http://www.zlib.net/zlib-%{version}.tar.xz
 # Patch0: zlib-1.2.5-lfs-decls.patch
@@ -41,7 +41,7 @@ Summary: Header files and libraries for developing apps which will use zlib.
 Summary(ja): zlib を使ったプログラム開発に必要なヘッダファイル/ライブラリ
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Provides: pkgconfig(zlib)
+Provides: pkgconfig(zlib) = %{version}
 
 %description devel
 The zlib-devel package contains the header files and libraries needed
@@ -181,6 +181,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Sun Mar 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.11-3
+- fixed "Provides:".
+
 * Sat Mar 21 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.11-2
 - dropped "Provides:pkgconfig(zlib)" from compat32-zlib-devel.