Browse Source

updated 2 packages

libconfig-1.7.3-1

ntfs-3g-2021.8.22-1
Tomohiro "Tomo-p" KATO 2 years ago
parent
commit
76850c7632
2 changed files with 45 additions and 52 deletions
  1. 28 30
      lib/libc/libconfig/libconfig-vl.spec
  2. 17 22
      n/ntfs-3g/ntfs-3g-vl.spec

+ 28 - 30
lib/libc/libconfig/libconfig-vl.spec

@@ -1,14 +1,15 @@
 Name:                   libconfig
 Summary:                C/C++ configuration file library
 Summary(ja):            C/C++ 設定ファイルライブラリ
-Version:                1.4.9
-Release:                2%{?_dist_release}
+Group:                  system
+Version:                1.7.3
+Release:                1%{?_dist_release}
+
 License:                LGPLv2+
-Group:                  System Environment/Libraries
-Source0:                http://www.hyperrealm.com/libconfig/libconfig-%{version}.tar.gz
-URL:                    http://www.hyperrealm.com/libconfig/
-BuildRequires:          texinfo, task-texlive
-BuildRequires:		bison, flex
+URL:                    https://hyperrealm.github.io/libconfig/
+Source0:                https://hyperrealm.github.io/libconfig/dist/libconfig-%{version}.tar.gz
+BuildRequires:          texinfo
+BuildRequires:          bison, flex
 
 %description
 Libconfig is a simple library for manipulating structured configuration
@@ -16,65 +17,62 @@ files. This file format is more compact and more readable than XML. And
 unlike XML, it is type-aware, so it is not necessary to do string parsing
 in application code.
 
+
 %package devel
 Summary:                Development files for libconfig
 Summary(ja):            libconfig の開発ファイル
-Group:                  Development/Libraries
+Group:                  programming
 Requires:               %{name} = %{version}-%{release}
 Requires:               pkgconfig
-Requires(post):         install-info
-Requires(preun):        install-info
+Requires:               install-info
 
 %description devel
 Development libraries and headers for developing software against
 libconfig.
 
+
+%debug_package
+
+
 %prep
 %setup -q
 iconv -f iso-8859-1 -t utf-8 -o AUTHORS{.utf8,}
 mv AUTHORS{.utf8,}
 
+
 %build
 %configure --disable-static
 make %{?_smp_mflags}
-make pdf
+
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install install-pdf
+make DESTDIR=$RPM_BUILD_ROOT install
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT%{_infodir}/dir
-# Prevent multilib conflicts
-sed -i '/^\/CreationDate/d' $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/libconfig.pdf
-sed -i '/^\/ModDate/d' $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/libconfig.pdf
-sed -i '/^\/ID /d' $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/libconfig.pdf
 
-%post -p /sbin/ldconfig
-
-%post devel
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
-
-%postun -p /sbin/ldconfig
-
-%preun devel
-if [ $1 = 0 ]; then
-   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
-fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING.LIB README
+%license COPYING.LIB
+%doc AUTHORS ChangeLog README*
 %{_libdir}/libconfig*.so.*
 
-
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/libconfig*
 %{_libdir}/libconfig*.so
 %{_libdir}/pkgconfig/libconfig*.pc
-%{_defaultdocdir}/%{name}/
+%dir %{_libdir}/cmake/libconfig
+%{_libdir}/cmake/libconfig
+%{_libdir}/cmake/libconfig++
 %{_infodir}/libconfig.info*
 
+
 %changelog
+* Thu Sep 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.3-1
+- new upstream release.
+- dropped scriptlets.
+
 * Sat Jul 09 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.9-2
 - rebuild with gcc-5.4.0
 

+ 17 - 22
n/ntfs-3g/ntfs-3g-vl.spec

@@ -3,9 +3,9 @@
 Summary:        Linux NTFS userspace driver 
 Summary(ja):    Linux NTFS ユーザ空間ドライバ
 Name:           ntfs-3g
-Version:        2017.3.23
+Version:        2021.8.22
 Release:        1%{?_dist_release}
-Group:          System Environment/Base
+Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -13,23 +13,12 @@ License:        GPLv2+
 URL:            https://www.tuxera.com/community/open-source-ntfs-3g/
 Source0:        https://tuxera.com/opensource/ntfs-3g_ntfsprogs-%{version}.tgz
 Patch0:         ntfs-3g_ntfsprogs-2011.10.9-RC-ntfsck-unsupported-return-0.patch
-Patch1:         check-mftmirr.patch
-Patch2:         ntfs-3g-big-sectors.patch
-# Fix for ntfsclone crash.
-# Discussed with upstream developer but not upstream yet, see:
-# https://bugzilla.redhat.com/show_bug.cgi?id=1601146#c4
-Patch3:         ntfsclone-full-clusters-bz1601146.patch
-# Upstream fix for CVE-2019-9755
-# https://sourceforge.net/p/ntfs-3g/ntfs-3g/ci/85c1634a26faa572d3c558d4cf8aaaca5202d4e9/
-Patch4:         ntfs-3g-CVE-2019-9755.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  libtool
 BuildRequires:  libattr-devel
-%if %{?_dist_release} != "vl6"
 BuildRequires:  libconfig-devel
-%endif
 BuildRequires:  libgcrypt-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  libuuid-devel
@@ -49,10 +38,11 @@ streams and sparse files; it can handle special files like symbolic links,
 devices, and FIFOs, ACL, extended attributes; moreover it provides full 
 file access right and ownership support.
 
+
 %package devel
 Summary:	Development files and libraries for ntfs-3g
 Summary(ja):	ntfs-3g の開発ファイルとライブラリ
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
 Provides:       ntfsprogs-devel = %{version}-%{release}
@@ -62,10 +52,11 @@ Obsoletes:      ntfsprogs-devel < 2.0.0-3
 Headers and libraries for developing applications that use ntfs-3g 
 functionality.
 
+
 %package -n ntfsprogs
 Summary:        NTFS filesystem libraries and utilities
 Summary(ja):    NTFS ファイルシステム用ライブラリおよびユーティリティ
-Group:          System Environment/Base
+Group:          system
 Provides:       ntfsprogs-gnomevfs = %{version}-%{release}
 Obsoletes:      ntfsprogs-gnomevfs < 2.0.0-3
 
@@ -76,13 +67,13 @@ such as mkntfs, ntfscat, ntfsls, ntfsresize, and ntfsundelete
 installation).
 
 
+%debug_package
+
+
 %prep
 %setup -q -n %{name}_ntfsprogs-%{version}
 %patch0 -p1 -b .unsupported
-%patch1 -p0 -b .check-mftmirr
-%patch2 -p0 -b .big-sectors
-%patch3 -p0 -b .ntfsclone
-%patch4 -p1 -b .CVE-2019-9755
+
 
 %build
 export CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64"
@@ -104,6 +95,7 @@ export CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64"
 
 make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=%{_bindir}/libtool install
@@ -133,12 +125,10 @@ mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig/libntfs-3g.pc $RPM_BUILD_ROOT%{_libdir}/pkg
 # We get this on our own, thanks.
 rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/README
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
@@ -199,7 +189,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/ntfs[^m][^o]*.8*
 %exclude %{_mandir}/man8/ntfs-3g*
 
+
 %changelog
+* Thu Sep 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2021.8.22-1
+- new upstream release.
+- dropped Patch1-4.
+
 * Fri Apr 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2017.3.23-1
 - new upstream release.
 - imported Patch1-4 from rawhide.