updated guile and pkgs depends on guile

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

a/autogen/autogen-vl.spec

@@ -1,16 +1,19 @@
-Version:    5.18.4
+Version:    5.18.16
 Release:    1%{?_dist_release}
 
 Summary:    AutoGen - The Automated Program Generator
 Name:       autogen
-URL:        http://www.gnu.org/software/autogen/     	
+URL:        https://www.gnu.org/software/autogen/
 License:    GPL2
 Group:      Development/Tools
-Source:     ftp://ftp.gnu.org/gnu/autogen/rel%{version}/autogen-%{version}.tar.xz
+Source:     https://ftp.gnu.org/gnu/autogen/rel%{version}/autogen-%{version}.tar.xz
+Patch0:     autogen-overlap.patch
+
 BuildRoot:  %{_tmppath}/%{name}-root
 
-Requires:	install-info
 Requires:	guile
+Requires:	install-info
+BuildRequires:	chrpath
 BuildRequires:	guile-devel
 BuildRequires:	libxml2-devel
 
@@ -33,46 +36,38 @@ autofsm BSD   This is a template for producing finite state machine programs
 The Copyright itself is privately held by Bruce Korb.
 
 %prep
-%setup -q
+%autosetup -p1
-chmod -R +rw *
+
+# Disable failing test
+sed -i 's|errors.test||' autoopts/test/Makefile.in
+
 
 %build
-autoreconf -if
+export CFLAGS="$RPM_OPT_FLAGS -Wno-implicit-fallthrough -Wno-format-overflow \
+                -Wno-format-truncation"
 %configure
-make CFLAGS="$RPM_OPT_FLAGS"
+# Omit unused direct shared library dependencies.
+sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' ./libtool
+
+make %{?_smp_mflags}
 
-if [ `id -u` -eq 0 ] && egrep -q ^nobody /etc/passwd
-then
-    echo "switching to user nobody to run 'make check'"
-    chown -R nobody . ; su -c "umask 002; make check || touch FAIL" nobody
-else
-    make check
-fi
-[ -f FAIL ] && exit 1
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}
+make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
-make install DESTDIR=${RPM_BUILD_ROOT}
+find $RPM_BUILD_ROOT -type f -name "*.la" -delete
-
+find $RPM_BUILD_ROOT -type f -name "*.a" -delete
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
-
+# Remove rpath.
-# IF we have a valid file list OR the build root is _the_ root,
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/{columns,getdefs,%{name},xml2ag}
-# THEN skip the file list generation.
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
-#
+
-if test \( -f autogen-filelist \
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-        -a -s autogen-filelist \) \
+
-        -o ${#RPM_BUILD_ROOT} -le 1
+
-then : ; else
+%check
-  ( cd ${RPM_BUILD_ROOT}
+make check
-    rm -f usr/share/info/dir
+
-    find . -type f | grep -v 'usr/share/doc'
-  ) | sed -e 's@^\./@/@' \
-          -e'/usr\/share\/info/s,$,.gz,' \
-          -e'/usr\/share\/man/s,$,.gz,' \
-    | sort \
-    > autogen-filelist
-fi
 
 %post
 /sbin/ldconfig
@@ -86,15 +81,33 @@ fi
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-%files -f autogen-filelist
+%files
 %defattr(-,root,root)
-%doc AUTHORS TODO COPYING NEWS THANKS README VERSION
+%license COPYING pkg/libopts/COPYING.gplv3
-#%%{_libdir}/libguileopts.so
+%license pkg/libopts/COPYING.mbsd pkg/libopts/COPYING.lgplv3
-#%%{_libdir}/libguileopts.so.0
+%doc AUTHORS TODO NEWS THANKS README VERSION
+%{_bindir}/*
+%{_infodir}/%{name}.info*.gz
+%{_mandir}/man1/*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/*
+
+%{_libdir}/libopts.so.25*
 %{_libdir}/libopts.so
-%{_libdir}/libopts.so.25
+%{_datadir}/aclocal/autoopts.m4
+%{_libdir}/pkgconfig/autoopts.pc
+%{_mandir}/man3/*
+%dir %{_includedir}/autoopts
+%{_includedir}/autoopts/options.h
+%{_includedir}/autoopts/usage-txt.h
 
 %changelog
+* Wed Sep 11 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.18.16-1
+- new upstream release.
+- imported Patch0 from rawhide.
+
 * Sun Jan 25 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.18.4-1
 - new upstream release
 

g/gnutls/gnutls-vl.spec

@@ -1,15 +1,17 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
+%global guile_shortver %(guile-config --version 2>&1 | sed -e 's/^guile-config.*version //' -e ' s/\.[0-9]*$//')
 
 Summary:	GNU TLS Library
 Summary(ja):	GNU TLS ライブラリ
 Name:		gnutls
-Version:	3.6.7
+Version:	3.6.9
 Release:	1%{?_dist_release}
 License:	GPLv3+ and LGPLv2+
 # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
 Group:		System Environment/Libraries
 URL:		http://www.gnutls.org/
-Source0:	%{name}-%{version}.tar.xz
+%global		shortver %(echo "%{version}" | sed -e 's/\.[0-9]*$//')
+Source0:	https://www.gnupg.org/ftp/gcrypt/gnutls/v%{shortver}/%{name}-%{version}.tar.xz
 Source1:	libgnutls-config
 
 #patches from fedora development
@@ -192,7 +194,8 @@ make install DESTDIR=%{buildroot}
 rm -f %{buildroot}%{_infodir}/dir
 rm -f %{buildroot}%{_libdir}/*.la
 rm -f %{buildroot}%{_libdir}/libguile*.a
-rm -f %{buildroot}%{_libdir}/guile/2.0/*.la
+rm -f %{buildroot}%{_libdir}/guile/%{guile_shortver}/*.la
+rm -f %{buildroot}%{_libdir}/guile/%{guile_shortver}/extensions/*.la
 rm -f %{buildroot}%{_libdir}/gnutls/libpkcs11mock1.*
 rm -rf %{buildroot}%{_docdir}/gnutls
 
@@ -260,11 +263,11 @@ fi
 
 %files guile
 %defattr(-,root,root,-)
-%{_libdir}/guile/2.0/guile*.so*
+%{_libdir}/guile/%{guile_shortver}/extensions/guile*.so*
-%{_libdir}/guile/2.0/site-ccache/gnutls.go
+%{_libdir}/guile/%{guile_shortver}/site-ccache/gnutls.go
-%{_libdir}/guile/2.0/site-ccache/gnutls/extra.go
+%{_libdir}/guile/%{guile_shortver}/site-ccache/gnutls/extra.go
-%{_datadir}/guile/site/2.0/gnutls
+%{_datadir}/guile/site/%{guile_shortver}/gnutls
-%{_datadir}/guile/site/2.0/gnutls.scm
+%{_datadir}/guile/site/%{guile_shortver}/gnutls.scm
 
 %files c++
 %{_libdir}/libgnutlsxx.so.*
@@ -284,12 +287,15 @@ fi
 
 %files -n compat32-%{name}-guile
 %defattr(-,root,root,-)
-%{_libdir}/guile/2.0/guile*.so*
+%{_libdir}/guile/%{guile_shortver}/extensions/guile*.so*
-%{_libdir}/guile/2.0/site-ccache/gnutls.go
+%{_libdir}/guile/%{guile_shortver}/site-ccache/gnutls.go
-%{_libdir}/guile/2.0/site-ccache/gnutls/extra.go
+%{_libdir}/guile/%{guile_shortver}/site-ccache/gnutls/extra.go
 %endif
 
 %changelog
+* Wed Sep 11 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.6.9-1
+- new upstream release.
+
 * Sun May 05 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.6.7-1
 - new upstream release.
 - updated Patch2.

g/graphviz/graphviz-vl.spec

@@ -4,7 +4,7 @@ Name:           graphviz
 Summary:        Graph Visualization Tools
 Summary(ja):	グラフ可視化ツール
 Version:        2.40.1
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Group:          Applications/Graphics
 License:        EPL
 URL:            http://www.graphviz.org/
@@ -195,7 +195,8 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%license COPYING
+%doc AUTHORS ChangeLog NEWS README
 %{_bindir}/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/gvpr
@@ -260,6 +261,9 @@ fi
 
 
 %changelog
+* Tue Sep 10 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.40.1-2
+- rebuilt with guile-2.2.
+
 * Sat Jan 06 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.40.1-1
 - updated to 2.40.1.
 - dropped all patches.

g/guile/guile-vl.spec

@@ -6,7 +6,7 @@ Name: guile
 Summary: A GNU implementation of Scheme for application extensibility.
 Summary(ja): アプリケーション拡張用 Scheme の GNU な実装
 Version: 2.2.6
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 Group: Development/Languages
 License: GPLv2+ and LGPLv2+ and GFDL and OFSFDL
@@ -225,6 +225,52 @@ if [ "$1" = 0 ]; then
 fi
 :
 
+%post devel
+if [ $1 -eq 1 -o ! -e %{_libdir}/pkgconfig/guile.pc ]; then
+    %{_sbindir}/update-alternatives \
+        --install \
+                %{_bindir}/guile-config \
+                guile-config \
+                %{_bindir}/guile-config%{?mver} \
+                %{alt_priority} \
+        --slave \
+                %{_bindir}/guile-snarf \
+                guile-snarf \
+                %{_bindir}/guile-snarf%{?mver} \
+        --slave \
+                %{_libdir}/pkgconfig/guile.pc \
+                guile.pc \
+                %{_libdir}/pkgconfig/guile-%{?mver}.pc
+fi
+
+%triggerpostun -- guile-devel < 2.0.14-4
+if [ ! -e %{_bindir}/guile-config ]; then
+    rm -f %{_sysconfdir}/alternatives/{guile-config,guile-snarf,guile.pc}
+    rm -f %{_sharedstatedir}/rpm/alternatives/{guile-config,guile-snarf,guile.pc}
+fi
+%{_sbindir}/update-alternatives \
+        --install \
+                %{_bindir}/guile-config \
+                guile-config \
+                %{_bindir}/guile-config%{?mver} \
+                %{alt_priority} \
+        --slave \
+                %{_bindir}/guile-snarf \
+                guile-snarf \
+                %{_bindir}/guile-snarf%{?mver} \
+        --slave \
+                %{_libdir}/pkgconfig/guile.pc \
+                guile.pc \
+                %{_libdir}/pkgconfig/guile-%{?mver}.pc
+
+%preun devel
+if [ "$1" = 0 ]; then
+    %{_sbindir}/update-alternatives \
+        --remove \
+                guile-config \
+                %{_bindir}/guile-config%{?mver}
+fi
+
 %if %{build_compat32}
 %post -n compat32-%{name} -p /sbin/ldconfig
 
@@ -293,6 +339,9 @@ fi
 
 
 %changelog
+* Wed Sep 11 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.6-2
+- made guile-devel alternatives-ready.
+
 * Mon Sep 09 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.6-1
 - updated to 2.2.6.
 - made alternatives-ready.

g/guile20/guile20-vl.spec

@@ -4,7 +4,7 @@ Name: guile20
 Summary: A GNU implementation of Scheme for application extensibility.
 Summary(ja): アプリケーション拡張用 Scheme の GNU な実装
 Version: 2.0.14
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 
 Group: Development/Languages
 License: GPLv2+ and LGPLv2+ and GFDL and OFSFDL
@@ -218,6 +218,52 @@ if [ "$1" = 0 ]; then
 fi
 :
 
+%post devel
+if [ $1 -eq 1 -o ! -e %{_libdir}/pkgconfig/guile.pc ]; then
+    %{_sbindir}/update-alternatives \
+        --install \
+                %{_bindir}/guile-config \
+                guile-config \
+                %{_bindir}/guile-config%{?mver} \
+                %{alt_priority} \
+        --slave \
+                %{_bindir}/guile-snarf \
+                guile-snarf \
+                %{_bindir}/guile-snarf%{?mver} \
+        --slave \
+                %{_libdir}/pkgconfig/guile.pc \
+                guile.pc \
+                %{_libdir}/pkgconfig/guile-%{?mver}.pc
+fi
+
+%triggerpostun -- guile-devel < 2.0.14-4
+if [ ! -e %{_bindir}/guile-config ]; then
+    rm -f %{_sysconfdir}/alternatives/{guile-config,guile-snarf,guile.pc}
+    rm -f %{_sharedstatedir}/rpm/alternatives/{guile-config,guile-snarf,guile.pc}
+fi
+%{_sbindir}/update-alternatives \
+        --install \
+                %{_bindir}/guile-config \
+                guile-config \
+                %{_bindir}/guile-config%{?mver} \
+                %{alt_priority} \
+        --slave \
+                %{_bindir}/guile-snarf \
+                guile-snarf \
+                %{_bindir}/guile-snarf%{?mver} \
+        --slave \
+                %{_libdir}/pkgconfig/guile.pc \
+                guile.pc \
+                %{_libdir}/pkgconfig/guile-%{?mver}.pc
+
+%preun devel
+if [ "$1" = 0 ]; then
+    %{_sbindir}/update-alternatives \
+        --remove \
+                guile-config \
+                %{_bindir}/guile-config%{?mver}
+fi
+
 %if %{build_compat32}
 %post -n compat32-%{name} -p /sbin/ldconfig
 
@@ -280,6 +326,9 @@ fi
 
 
 %changelog
+* Wed Sep 11 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.14-4
+- made guile20-devel alternatives-ready.
+
 * Mon Sep 09 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.14-3
 - changed %name.
 - made alternatives-ready.

m/make/make-vl.spec

@@ -2,14 +2,14 @@ Summary:     A GNU tool which simplifies the build process for users.
 Summary(ja): ユーザのビルド手続きを平易にする GNU ツール
 Name: make
 Epoch: 1
-Version: 4.1
+Version: 4.2.1
 Release: 1%{?_dist_release}
 License: GPL
 Group: Development/Tools
 URL: http://www.gnu.org/software/make/
-Source: ftp://ftp.gnu.org/gnu/make/make-%{version}.tar.bz2
+Source: https://ftp.gnu.org/gnu/make/make-%{version}.tar.bz2
-
+Source1: http://translationproject.org/PO-files/ja/make-%{version}.ja.po
-Patch0: make-4.0-getcwd.patch
+Patch0: make-4.2-getcwd.patch
 Patch1: make-4.0-newlines.patch
 
 # Assume we don't have clock_gettime in configure, so that
@@ -18,20 +18,25 @@ Patch1: make-4.0-newlines.patch
 Patch2: make-4.0-noclock_gettime.patch
 
 # BZs #142691, #17374
-Patch3: make-4.0-j8k.patch
+Patch3: make-4.2-j8k.patch
-
-# make sure errno for error reporting is not lost accross _() calls
-Patch4: make-4.0-err-reporting.patch
 
 # Upstream: https://savannah.gnu.org/bugs/?30748
 # The default value of .SHELL_FLAGS is -c.
-Patch5: make-4.0-weird-shell.patch
+Patch4: make-4.0-weird-shell.patch
-
+
-# make seg faults when run with no arguments
+# Upstream patch: https://git.savannah.gnu.org/cgit/make.git/patch/?id=193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4
-Patch6: make-4.1-rh1277968.patch
+# Fixes wrong assumptions of glibc's glob internals.
-
+Patch5: make-4.2.1-glob-fix-2.patch
-# fix ja.po
+# Upstream patch: https://git.savannah.gnu.org/cgit/make.git/patch/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4
-Patch1000: make-4.1-ja.po.patch
+# Fixes incorrect use of glibc 2.27 glob internals.
+Patch6: make-4.2.1-glob-fix.patch
+Patch7: make-4.2.1-glob-fix-3.patch
+# Perl 5.26 removed the implicit CWD in @INC.
+Patch8: make-4.2.1-test-driver.patch
+
+# Upstream patch: https://git.savannah.gnu.org/cgit/make.git/commit/?id=fbf71ec25a5986d9003ac16ee9e23675feac9053
+# Adds support of guile 2.2
+Patch9: 0001-configure.ac-SV-50648-Detect-Guile-2.2-packages.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires(post): /sbin/install-info
@@ -68,26 +73,21 @@ GNU make ツールは，プログラムのインストールを容易にする
 非常によく使われますので，このパッケージは是非インストールして下さい．
 
 %prep
-%setup -q
+%autosetup -p1
-
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 rm -f tests/scripts/features/parallelism.orig
 
-%patch1000 -p1 -b .po
+cp -f %{SOURCE1} po/ja.po
 
 %build
+autoreconf -vfi
+
 %if %{?_dist_release} == "vl6"
 %configure
 %else
 %configure --with-guile
 %endif
+make -C po ja.gmo
 make %{?_smp_mflags}
 
 %install
@@ -126,6 +126,11 @@ fi
 %{_includedir}/gnumake.h
 
 %changelog
+* Wed Sep 11 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.2.1-1
+- new upstream release.
+- updated patches.
+- updated ja.po.
+
 * Wed May 25 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.1-1
 - new upstream release.
 - dropped all patches.