updated 2 packages

djvulibre-3.5.27-1

gperf-3.1-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12443 ec354946-7b23-47d6-9f5a-488ba84defc7

d/djvulibre/djvulibre-vl.spec

@@ -1,22 +1,31 @@
 Summary: DjVu viewers, encoders and utilities.
 Summary(ja): DjVu 画像形式ファイル操作用ライブラリ、ツール
 Name: djvulibre
-Version: 3.5.25.3
-Release: 3%{?_dist_release}
+Version: 3.5.27
+Release: 1%{?_dist_release}
+Distribution: Project Vine
+Vendor: Vine Linux
+Packager: owa
+
 License: GPLv2
-Group: System Environment/Libraries
 URL: http://djvu.sourceforge.net
-
 Source0: http://prdownloads.sourceforge.net/djvu/djvulibre-%{version}.tar.gz
+
+Patch0: djvulibre-3.5.22-cdefs.patch
+Patch2: djvulibre-3.5.27-buffer-overflow.patch
+Patch3: djvulibre-3.5.27-infinite-loop.patch
+Patch4: djvulibre-3.5.27-stack-overflow.patch
+Patch5: djvulibre-3.5.27-zero-bytes-check.patch
+Patch6: djvulibre-3.5.27-export-file.patch
+Patch7: djvulibre-3.5.27-null-dereference.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtiff-devel
 BuildRequires: libjpeg-devel
 BuildRequires: glibc-devel
 BuildRequires: inkscape
-
-Distribution: Project Vine
-Vendor: Vine Linux
-Packager: owa
+BuildRequires: xdg-utils chrpath
+BuildRequires: hicolor-icon-theme
 
 %description 
 DjVu is a web-centric format and software platform for distributing documents
@@ -43,6 +52,7 @@ DjVulibre-3.5 contains:
 - A set of decoders to convert DjVu to a number of other formats. 
 - An up-to-date version of the C++ DjVu Reference Library.
 
+
 %package devel
 Summary: The libraries and header files needed for djvulibre development.
 Group: Development/Libraries
@@ -53,18 +63,14 @@ DjVulibre libraries and header files for development.
 
 
 %prep
-%setup -q -n %{name}-3.5.25
+%setup -q -n %{name}-%{version}
+%autopatch -p1
 
 
 %build
-%ifarch i386
-export CXXFLAGS="-march=i686"
-%endif
-%configure 
+%configure --enable-threads
+make %{?_smp_mflags} V=1
 
-# don't set smp option (-j n)
-make depend
-make
 
 %install
 rm -rf %{buildroot}
@@ -73,32 +79,68 @@ make DESTDIR=%{buildroot} install
 # fix to stop ldconfig from complaining
 find %{buildroot}%{_libdir} -name "*.so*" -exec chmod 755 {} \;
 
-# cleanup of the docs
-rm -rf doc/CVS 2>/dev/null || :
+# Remove rpath
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvutoxml
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvused
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/cjb2
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/csepdjvu
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvuserve
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvm
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvuxmlparser
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvutxt
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/ddjvu
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvumake
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/cpaldjvu
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvuextract
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/c44
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvups
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvudump
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/djvmcvt
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/bzz
+
+# This XML file does not differentiate between DjVu Image and DjVu Document
+# MIME types, the default one in shared-mime-info does.
+rm -f $RPM_BUILD_ROOT%{_datadir}/mime/packages/djvulibre-mime.xml
+
+# MIME types (icons and desktop file) - this installs icon files under
+# /usr/share/icons/hicolor/ and an xml file under /usr/share/mime/image/
+# Taken from {_datadir}/djvu/osi/desktop/register-djvu-mime install
+# See also the README file in the desktopfiles directory of the source distribution
+pushd desktopfiles
+for i in 22 32 48 64 ; do
+    install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/mimetypes/
+    cp -a ./prebuilt-hi${i}-djvu.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/mimetypes/image-vnd.djvu.mime.png
+#    cp -a ./hi${i}-djvu.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}x${i}/mimetypes/gnome-mime-image-vnd.djvu.png
+done
+popd
 
 
 %preun -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+
 %clean
 rm -rf %{buildroot}
 
 
 %files
 %defattr(-, root, root)
-%doc README COPYRIGHT COPYING NEWS doc
+%license COPYRIGHT COPYING
+%doc README NEWS doc
 %{_bindir}
 %{_libdir}/lib*.so.*
 %exclude %{_libdir}/libdjvulibre.la
 %exclude %{_datadir}/djvu/osi/de/*
 %exclude %{_datadir}/djvu/osi/fr/*
 %exclude %{_datadir}/djvu/osi/zh/*
+%dir %{_datadir}/djvu
 %{_datadir}/djvu/pubtext
-%{_datadir}/djvu/osi/desktop
+%dir %{_datadir}/djvu/osi
 %{_datadir}/djvu/osi/languages.xml
 %{_datadir}/djvu/osi/en
-%{_datadir}/djvu/osi/cs/messages.xml
+%{_datadir}/djvu/osi/cs
 %lang(ja) %{_datadir}/djvu/osi/ja*
+%{_datadir}/icons/hicolor/*/mimetypes/*
 %{_mandir}/man?
 
 %files devel
@@ -109,6 +151,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Aug 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.5.27-1
+- new upstream release.
+
 * Fri Jul  1 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.5.25.3-3
 - rebuilt with new toolchain.
 

g/gperf/gperf-vl.spec

@@ -1,17 +1,17 @@
 Summary:	A perfect hash function generator.
 Summary(ja):	完全ハッシュ関数生成プログラム
 Name:		gperf
-Version:	3.0.4
-Release:	4%{?_dist_release}
+Version:	3.1
+Release:	1%{?_dist_release}
+Vendor:		Project Vine
+Distribution:	Vine Linux
+
 License:	GPLv3+
-Source:		ftp://ftp.gnu.org/pub/gnu/gperf/gperf-%{version}.tar.gz
-Group:		Development/Tools
+Source:		https://ftp.gnu.org/gnu/gperf/gperf-%{version}.tar.gz
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
 
 %description
 Gperf is a perfect hash function generator written in C++. Simply
@@ -19,12 +19,15 @@ stated, a perfect hash function is a hash function and a data
 structure that allows recognition of a key word in a set of words
 using exactly one probe into the data structure.
 
+
 %prep
 %setup -q
 
+
 %build
 %configure
-make
+make %{_smp_mflags}
+
 
 %install
 [ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
@@ -34,9 +37,11 @@ make
 rm -rf %{buildroot}/%{_mandir}/{dvi,html}
 rm -rf %{buildroot}%{_prefix}/share/doc
 
+
 %clean
 [ -n "%{buildroot}" -a "%{buildroot}" != / ] && rm -rf %{buildroot}
 
+
 %post
 /sbin/install-info %{_infodir}/gperf.info.gz %{_infodir}/dir
 
@@ -45,6 +50,7 @@ if [ $1 = 0 ]; then
    /sbin/install-info --delete %{_infodir}/gperf.info.gz %{_infodir}/dir
 fi
 
+
 %files
 %defattr(-,root,root)
 %doc README NEWS doc/gperf.html
@@ -52,7 +58,11 @@ fi
 %{_mandir}/man1/gperf.1*
 %{_infodir}/gperf.info*
 
+
 %changelog
+* Tue Aug 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.1-1
+- new upstream release.
+
 * Sun Jul 10 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 3.0.4-4
 - rebuild with gcc-5.4.0