updated 5 packages

llvm-9.0.0-1

libdrm-2.4.99-1

mesa-19.1.7-1

nasm-2.14.02-1

python-mako-1.1.0-1

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

l/llvm/llvm-vl.spec

@@ -18,7 +18,7 @@
 %define _unpackaged_files_terminate_build 1
 
 Name:           llvm
-Version:        7.0.1
+Version:        9.0.0
 Release:        1%{?_dist_release}
 Summary:        The Low Level Virtual Machine
 Summary(ja):    LLVM - 低レベルバーチャルマシン
@@ -30,14 +30,15 @@ URL:            http://llvm.org/
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
-Source0:        http://llvm.org/releases/%{version}/llvm-%{version}.src.tar.xz
-Source1:        http://llvm.org/releases/%{version}/cfe-%{version}.src.tar.xz
-Source2:        http://llvm.org/releases/%{version}/compiler-rt-%{version}.src.tar.xz
-Source3:        http://llvm.org/releases/%{version}/lldb-%{version}.src.tar.xz
-Source4:        http://llvm.org/releases/%{version}/lld-%{version}.src.tar.xz
+Source0:        http://releases.llvm.org/%{version}/llvm-%{version}.src.tar.xz
+Source1:        http://releases.llvm.org/%{version}/cfe-%{version}.src.tar.xz
+Source2:        http://releases.llvm.org/%{version}/compiler-rt-%{version}.src.tar.xz
+Source3:        http://releases.llvm.org/%{version}/lldb-%{version}.src.tar.xz
+Source4:        http://releases.llvm.org/%{version}/lld-%{version}.src.tar.xz
 %if %{with clang_tools_extra}
-Source5:        http://llvm.org/releases/%{version}/clang-tools-extra-%{version}.src.tar.xz
+Source5:        http://releases.llvm.org/%{version}/clang-tools-extra-%{version}.src.tar.xz
 %endif
+Source6:        http://releases.llvm.org/%{version}/openmp-%{version}.src.tar.xz
 
 # multilib fixes
 Source10:        llvm-config.h
@@ -328,6 +329,23 @@ Requires:       python-six
 The package contains the LLDB Python module.
 
 
+%package -n libomp
+Summary:        OpenMP runtime for clang
+Summary(ja):    clang用OpenMPランタイム
+
+%description -n libomp
+The package contains the OpenMP runtime for clang.
+
+
+%package -n libomp-devel
+Summary:        OpenMP header files
+Summary(ja):    OpenMPヘッダファイル
+Requires:       clang-devel%{?isa} = %{version}
+
+%description -n libomp-devel
+The package contains the OpenMP header files.
+
+
 %if %{with ocaml}
 %package        ocaml
 Summary:        OCaml binding for LLVM
@@ -378,11 +396,11 @@ Shared libraries for the LLVM compiler infrastructure.
 
 
 %prep
-%setup -q -a1 -a2 -a3 -a4 -n llvm-%{version}.src 
+%setup -q -a1 -a2 -a3 -a4 -a6 -n llvm-%{version}.src 
 
 %patch3 -p1
-%patch7 -p1
-%patch12 -p1
+#%patch7 -p1
+#%patch12 -p1
 %patch15 -p1
 
 rm -rf tools/clang tools/lld tools/lldb projects/compiler-rt
@@ -390,6 +408,7 @@ mv cfe-%{version}.src tools/clang
 mv compiler-rt-%{version}.src projects/compiler-rt
 mv lldb-%{version}.src tools/lldb
 mv lld-%{version}.src tools/lld
+mv openmp-%{version}.src projects/openmp
 
 %if %{with clang_tools_extra}
 tar xvf %{SOURCE5}
@@ -399,7 +418,7 @@ mv clang-tools-extra-%{version}.src tools/clang/tools/extra
 pushd tools/clang
 %patch100 -p1 -b .lit-search-path
 %patch101 -p1 -b .fstack-clash-protection
-%patch102 -p1 -b .vendor-gcc
+#patch102 -p1 -b .vendor-gcc
 popd
 
 pushd tools/lld
@@ -480,6 +499,9 @@ LDFLAGS="%{?__global_ldflags} -L$TMP_PWD/%{_lib} -lpthread -ldl"
         \
         -DLLDB_LINK_LLVM_DYLIB:BOOL=ON \
         \
+        -DLIBOMP_INSTALL_ALIASES=OFF \
+        -DLIBOMP_HEADERS_INSTALL_PATH:PATH=%{_libdir}/clang/%{version}/include \
+        \
         -DPYTHON_EXECUTABLE:STRING=%{__python} \
         -DPYTHON_VERSION_MAJOR:STRING=$(%{__python} -c "import sys; print sys.version_info.major") \
         -DPYTHON_VERSION_MINOR:STRING=$(%{__python} -c "import sys; print sys.version_info.minor") \
@@ -537,7 +559,6 @@ rm -fv %{buildroot}%{_libdir}/liblldb*.a
 # python: fix binary libraries location
 liblldb=$(basename $(readlink -e %{buildroot}%{_libdir}/liblldb.so))
 ln -vsf "../../../${liblldb}" %{buildroot}%{python_sitearch}/lldb/_lldb.so
-mv -v %{buildroot}%{python_sitearch}/readline.so %{buildroot}%{python_sitearch}/lldb/readline.so
 
 # remove bundled six.py
 rm -f %{buildroot}%{python_sitearch}/six.*
@@ -664,10 +685,11 @@ exit 0
 %{_bindir}/llvm-config-%{__isa_bits}
 %{_includedir}/%{name}
 %{_includedir}/%{name}-c
-%{_libdir}/BugpointPasses.so
+#{_libdir}/BugpointPasses.so
 %{_libdir}/LLVMgold.so
 %{_libdir}/libLLVM.so
 %{_libdir}/libLTO.so*
+%{_libdir}/libRemarks.so
 %{_libdir}/cmake/llvm
 %exclude %{_libdir}/cmake/llvm/LLVMStaticExports.cmake
 
@@ -677,7 +699,8 @@ exit 0
 #config(noreplace) %{_sysconfdir}/ld.so.conf.d/llvm-%{_arch}.conf
 #dir %{_libdir}/%{name}
 %{_libdir}/libLLVM-*.so
-%exclude %{_libdir}/LLVMHello.so
+%{_libdir}/libRemarks.so.*
+#exclude %{_libdir}/LLVMHello.so
 
 %files static
 %{_libdir}/*.a
@@ -696,6 +719,8 @@ exit 0
 %defattr(-,root,root,-)
 %{_libdir}/libclang.so
 %{_libdir}/libclang.so.*
+%{_libdir}/libclang-cpp.so
+%{_libdir}/libclang-cpp.so.*
 
 %files -n clang-devel
 %defattr(-,root,root,-)
@@ -709,6 +734,9 @@ exit 0
 %defattr(-,root,root,-)
 %{_bindir}/scan-build
 %{_bindir}/scan-view
+%{_libdir}/CheckerDependencyHandlingAnalyzerPlugin.so
+%{_libdir}/CheckerOptionHandlingAnalyzerPlugin.so
+%{_libdir}/SampleAnalyzerPlugin.so
 %{_libexecdir}/ccc-analyzer
 %{_libexecdir}/c++-analyzer
 %{_datadir}/scan-view
@@ -751,6 +779,15 @@ exit 0
 %exclude %{_libdir}/liblldb*.so
 %endif
 
+%files -n libomp
+%{_libdir}/libomp.so
+%{_libdir}/libomptarget.so
+
+%files -n libomp-devel
+%{_libdir}/clang/%{version}/include/omp.h
+%{_libdir}/clang/%{version}/include/omp-tools.h
+%{_libdir}/clang/%{version}/include/ompt.h
+
 %files doc
 %defattr(-,root,root,-)
 %doc docs/*
@@ -801,6 +838,10 @@ exit 0
 %endif
 
 %changelog
+* Fri Sep 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9.0.0-1
+- new upstream release.
+- added OpenMP.
+
 * Sun Dec 16 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.0.1-1
 - fixed %%files.
 

lib/libd/libdrm/libdrm-vl.spec

@@ -4,7 +4,7 @@
 Summary: Direct Rendering Manager runtime library
 Summary(ja): Direct Rendering Manager ランタイムライブラリ
 Name: libdrm
-Version: 2.4.96
+Version: 2.4.99
 Release: 1%{?_dist_release}
 License: MIT
 Group: System Environment/Libraries
@@ -234,6 +234,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Sep 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.99-1
+- updated to 2.4.99.
+
 * Wed Dec 05 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.96-1
 - updated to 2.4.96.
 - droppedd Patch5.

m/mesa/mesa-vl.spec

@@ -3,51 +3,64 @@
 %bcond_with libva
 %bcond_with glvnd
 
-%define _unpackaged_files_terminate_build 1
+%global with_hardware 1
+%global with_vdpau 1
+#global with_vaapi 1
+%global with_nine 1
+#global with_omx 1
+#global with_opencl 1
+%global base_drivers nouveau,r100,r200
 
-%define base_drivers swrast,nouveau,radeon,r200
 %ifarch %{ix86}
 %define ix86_drivers ,i915,i965
 %endif
 %ifarch x86_64
 %define amd64_drivers ,i915,i965
 %endif
-%define dri_drivers --with-dri-drivers=%{base_drivers}%{?ix86_drivers}%{?amd64_drivers}
+%define dri_drivers %{base_drivers}%{?ix86_drivers}%{?amd64_drivers}
 
-%ifarch %{ix86} x86_64
-#define with_opencl 1
+%global with_iris   1
+%global with_vmware 1
+%global with_xa     1
 %if %{with vulkan}
-%define vulkan_drivers --with-vulkan-drivers=intel,radeon
-%endif
+%global vulkan_drivers intel,amd
+%else
+%global vulkan_drivers %{nil}
 %endif
+%global with_radeonsi 1
+%global with_asm 1
 
-%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-Summary: Mesa graphics libraries
-Summary(ja): Mesa グラフィックスライブラリ
-Name: mesa
-Version: 18.2.6
-Release: 1%{?_dist_release}
-License: MIT
-Group: System Environment/Libraries
-URL: http://www.mesa3d.org
+%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-Vendor: Project Vine
-Distribution: Vine Linux
+Summary:        Mesa graphics libraries
+Summary(ja):    Mesa グラフィックスライブラリ
+Name:           mesa
+Version:        19.1.7
+Release:        1%{?_dist_release}
+License:        MIT
+Group:          System Environment/Libraries
+Vendor:         Project Vine
+Distribution:   Vine Linux
+URL:            https://www.mesa3d.org/
+Source0:        https://mesa.freedesktop.org/archive/%{name}-%{version}.tar.xz
+
+Source2:        glesv2.pc
+Source3:        egl.pc
 
-Source0: ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}-%{version}.tar.xz
-Source1:        vl_decoder.c
-Source2:        vl_mpeg12_decoder.c
-Source3:        Makefile
 # src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license.
 # Source4 contains email correspondence clarifying the license terms.
 # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD.
 Source4:        Mesa-MLAA-License-Clarification-Email.txt
 
-Patch1:         0001-llvm-SONAME-without-version.patch
 Patch3:         0003-evergreen-big-endian.patch
 
+# Disable rgb10 configs by default:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1560481
+Patch7:         0001-gallium-Disable-rgb10-configs-by-default.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: meson
 BuildRequires: pkgconfig
 BuildRequires: flex, bison
 BuildRequires: libstdc++-static
@@ -66,10 +79,14 @@ BuildRequires: libXmu-devel
 BuildRequires: libXrandr-devel
 BuildRequires: libxshmfence-devel
 BuildRequires: eudev-libudev-devel
-BuildRequires: llvm-devel >= 7.0.0
+BuildRequires: llvm-devel >= 9.0.0
 %if 0%{?with_opencl}
 BuildRequires: clang-devel >= 3.3
 %endif
+BuildRequires: python3-devel
+BuildRequires: python3-rpm-macros
+BuildRequires: python3-setuptools
+BuildRequires: python3-mako
 BuildRequires: libxml2-python
 BuildRequires: libvdpau-devel >= 1.1
 BuildRequires: elfutils-libelf-devel
@@ -244,6 +261,22 @@ Provides: libxatracker-devel
 %description libxatracker-devel
 Mesa XA state tracker development package
 
+%if 0%{?with_nine}
+%package libd3d
+Group:          System Environment/Libraries
+Summary:        Mesa Direct3D9 state tracker
+
+%description libd3d
+%{summary}.
+
+%package libd3d-devel
+Summary:        Mesa Direct3D9 state tracker development package
+Group:          Development/Libraries
+Requires:       %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description libd3d-devel
+%{summary}.
+%endif
 
 %package source
 Summary: Mesa source code required to build X server
@@ -409,77 +442,60 @@ Headers for development with the Vulkan API.
 
 %prep
 %autosetup -n %{name}-%{version} -p1
-cp -f %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c
-cp -f %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
+cp %{SOURCE2} .
+cp %{SOURCE3} .
 
 cp %{SOURCE4} docs/
 
 
 %build
 
-autoreconf -vfi
-
-# C++ note: we never say "catch" in the source.  we do say "typeid" once,
-# in an assert, which is patched out above.  LLVM doesn't use RTTI or throw.
-#
-# We do say 'catch' in the clover and d3d1x state trackers, but we're not
-# building those yet.
-export CXXFLAGS="%{?with_opencl:-frtti -fexceptions} %{!?with_opencl:-fno-rtti -fno-exceptions}"
-export LDFLAGS="-static-libstdc++"
-%ifarch %{ix86}
-# i do not have words for how much the assembly dispatch code infuriates me
-%global asm_flags --disable-asm
+%meson -Dcpp_std=gnu++11 \
+  -Dplatforms=x11,drm,surfaceless \
+  -Ddri3=true \
+  -Ddri-drivers=%{?dri_drivers} \
+%if 0%{?with_hardware}
+  -Dgallium-drivers=swrast,virgl,r300,nouveau%{?with_iris:,iris}%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi,r600}%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_kmsro:,kmsro}%{?with_lima:,lima}%{?with_panfrost:,panfrost} \
+%else
+  -Dgallium-drivers=swrast,virgl \
 %endif
-
-# now build the rest of mesa
-%configure \
-    %{?asm_flags} \
+  -Dgallium-vdpau=%{?with_vdpau:true}%{!?with_vdpau:false} \
+  -Dgallium-xvmc=false \
+  -Dgallium-omx=%{?with_omx:bellagio}%{!?with_omx:disabled} \
+  -Dgallium-va=%{?with_vaapi:true}%{!?with_vaapi:false} \
+  -Dgallium-xa=%{?with_xa:true}%{!?with_xa:false} \
+  -Dgallium-nine=%{?with_nine:true}%{!?with_nine:false} \
+  -Dgallium-opencl=%{?with_opencl:icd}%{!?with_opencl:disabled} \
+  -Dvulkan-drivers=%{?vulkan_drivers} \
+  -Dshared-glapi=true \
+  -Dgles1=false \
+  -Dgles2=true \
+  -Dopengl=true \
+  -Dgbm=true \
+  -Dglx=dri \
+  -Degl=true \
 %if %{with glvnd}
-    --enable-libglvnd \
-%endif
-    --disable-selinux \
-    --enable-gallium-osmesa \
-    --with-dri-driverdir=%{_libdir}/dri \
-    --enable-egl \
-    --enable-gles1 \
-    --enable-gles2 \
-    --disable-xvmc \
-    --enable-vdpau \
-%if %{with libva}
-    --enable-va \
-%endif
-    --with-platforms=x11,drm,surfaceless \
-    --enable-shared-glapi \
-    --enable-gbm \
-    %{?with_opencl:--enable-opencl --enable-opencl-icd} %{!?with_opencl:--disable-opencl} \
-    --enable-glx-tls \
-    --enable-texture-float=yes \
-%if %{with vulkan}
-    %{?vulkan_drivers} \
+  -Dglvnd=true \
+%else
+  -Dglvnd=false \
 %endif
-    --enable-gallium-llvm \
-    --enable-llvm \
-    --with-llvm-shared-libs \
-    --enable-dri \
-    --enable-xa \
-    --with-gallium-drivers=svga,r300,r600,radeonsi,nouveau,swrast,virgl \
-    %{?dri_drivers}
-
-# libtool refuses to pass through things you ask for in LDFLAGS that it doesn't
-# know about, like -static-libstdc++, so...
-sed -i 's/-fuse-linker-plugin|/-static-lib*|&/' libtool
-sed -i 's/-nostdlib//g' libtool
-sed -i 's/^predep_objects=.*$/#&/' libtool
-sed -i 's/^postdep_objects=.*$/#&/' libtool
-sed -i 's/^postdeps=.*$/#&/' libtool
-
-make %{?_smp_mflags} MKDEP=/bin/true V=1
+  -Dasm=%{?with_asm:true}%{!?with_asm:false} \
+  -Dllvm=true \
+  -Dshared-llvm=true \
+  -Dvalgrind=%{?with_valgrind:true}%{!?with_valgrind:false} \
+  -Dbuild-tests=false \
+  -Dselinux=false \
+  -Dosmesa=gallium \
+  %{nil}
+%meson_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
+%meson_install
 
-# core libs and headers, but not drivers.
-make install DESTDIR=$RPM_BUILD_ROOT DRI_DIRS=
+install glesv2.pc %{buildroot}%{_libdir}/pkgconfig/
+
+install egl.pc %{buildroot}%{_libdir}/pkgconfig/
 
 # libvdpau opens the versioned name, don't bother including the unversioned
 rm -f %{buildroot}%{_libdir}/vdpau/*.so
@@ -493,19 +509,24 @@ rm -f %{buildroot}%{_libdir}/libGLES*
 # glvnd needs a default provider for indirect rendering where it cannot
 # determine the vendor
 ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
+ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_system.so.0
 %endif
 
 # strip out useless headers
 rm -f %{buildroot}%{_includedir}/GL/w*.h
 
-# these are shipped already in vulkan-devel
-rm -f %{buildroot}/%{_includedir}/vulkan/vk_platform.h
-rm -f %{buildroot}/%{_includedir}/vulkan/vulkan.h
-
 pushd $RPM_BUILD_ROOT%{_libdir}
 rm -f xorg/modules/drivers/modesetting_drv.so
 popd
 
+# this keeps breaking, check it early.  note that the exit from eu-ftr is odd.
+pushd %{buildroot}%{_libdir}
+for i in libOSMesa*.so libGL.so ; do
+    eu-findtextrel $i && exit 1
+done
+popd
+
+
 # remove .la files
 find %{buildroot} -name '*.la' -delete
 
@@ -590,9 +611,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files dri-drivers
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/drirc
 %dir %{_libdir}/dri
 %{_libdir}/dri/*_dri.so
+%dir %{_datadir}/drirc.d
+%config(noreplace) %{_datadir}/drirc.d/*
 
 %files vdpau-drivers
 %defattr(-,root,root,-)
@@ -621,8 +643,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libGLES
 %defattr(-,root,root,-)
-%{_libdir}/libGLESv1_CM.so.1
-%{_libdir}/libGLESv1_CM.so.1.*
 %{_libdir}/libGLESv2.so.2
 %{_libdir}/libGLESv2.so.2.*
 %{_libdir}/libglapi.so.0
@@ -630,11 +650,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libGLES-devel
 %defattr(-,root,root,-)
-%dir %{_includedir}/GLES
-%{_includedir}/GLES/egl.h
-%{_includedir}/GLES/gl.h
-%{_includedir}/GLES/glext.h
-%{_includedir}/GLES/glplatform.h
 %dir %{_includedir}/GLES2
 %{_includedir}/GLES2/gl2platform.h
 %{_includedir}/GLES2/gl2.h
@@ -645,9 +660,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/GLES3/gl3ext.h
 %{_includedir}/GLES3/gl31.h
 %{_includedir}/GLES3/gl32.h
-%{_libdir}/pkgconfig/glesv1_cm.pc
 %{_libdir}/pkgconfig/glesv2.pc
-%{_libdir}/libGLESv1_CM.so
 %{_libdir}/libGLESv2.so
 
 %files libOSMesa
@@ -689,6 +702,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/xa_context.h
 %{_libdir}/pkgconfig/xatracker.pc
 
+%if 0%{?with_nine}
+%files libd3d
+%dir %{_libdir}/d3d/
+%{_libdir}/d3d/*.so.*
+
+%files libd3d-devel
+%{_libdir}/pkgconfig/d3d.pc
+%{_includedir}/d3dadapter/
+%{_libdir}/d3d/*.so
+%endif
+
 # We constructed this dir carefully, so just slurp in the whole thing.
 %files source
 %defattr(-,root,root,-)
@@ -742,8 +766,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n compat32-%{name}-libGLES
 %defattr(-,root,root,-)
-%{_libdir}/libGLESv1_CM.so.1
-%{_libdir}/libGLESv1_CM.so.1.*
 %{_libdir}/libGLESv2.so.2
 %{_libdir}/libGLESv2.so.2.*
 %{_libdir}/libglapi.so.0
@@ -751,7 +773,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n compat32-%{name}-libGLES-devel
 %defattr(-,root,root,-)
-%{_libdir}/libGLESv1_CM.so
 %{_libdir}/libGLESv2.so
 %{_libdir}/libglapi.so
 
@@ -777,6 +798,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Sep 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 19.1.7-1
+- updated to 19.1.7.
+- dropped Patch1.
+- imported Patche7 from rawhide.
+- switched the build-system to meson.
+
 * Wed Dec 05 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 18.2.6-1
 - updated to 18.2.6.
 - dropped Patch2, 4, 10 and 11.

n/nasm/nasm-vl.spec

@@ -1,4 +1,4 @@
-%define nasm_version 2.11.08
+%define nasm_version 2.14.02
 %define download http://www.nasm.us/pub/nasm/releasebuilds
 Summary: The Netwide Assembler, a portable x86 assembler with Intel-like syntax
 Summary(ja): Netwide アセンブラ: Intel ライクなシンタックスのポータブル x86 アセンブラ
@@ -12,9 +12,6 @@ Source0: %{download}/%{nasm_version}/nasm-%{nasm_version}.tar.xz
 Source1: %{download}/%{nasm_version}/nasm-%{nasm_version}-xdoc.tar.xz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: ghostscript
-BuildRequires: perl
-BuildRequires: texinfo
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -24,8 +21,6 @@ Packager: owa
 Summary: Extensive documentation for NASM
 SUmmary(ja): NASM のドキュメント
 Group: Applications/Documentation
-Requires(post): install-info
-Requires(preun): install-info
 
 %package rdoff
 Summary: Tools for the RDOFF binary format, sometimes used with NASM.
@@ -43,12 +38,10 @@ NASM は Netwide アセンブラです。Intel 80x86 プロセッサシリーズ
 ニーモニックと文法を使います。
 
 %description doc
-Extensive documentation for the Netwide Assembler, NASM, in HTML,
-info, PostScript and text formats.
+Extensive documentation for the Netwide Assembler, NASM, in HTML format.
 
 %description doc -l ja
-Netwide アセンブラ NASM のドキュメントです。
-HTML、Info、ポストスクリプト、テキスト形式です。
+Netwide アセンブラ NASM のHTML形式ドキュメントです。
 
 %description rdoff
 Tools for the operating-system independent RDOFF binary format, which
@@ -63,60 +56,51 @@ RDOFF バイナリフォーマットの OS 用のツールで、NASM が使い
 %setup -q -n nasm-%{nasm_version} -b 1
 
 %build
+autoreconf
 LDFLAGS=-s %configure
 
-## don't use _smp_mflags (at 2.07.00)
-#make %{?_smp_mflags} everything
-make everything
+make %{?_smp_mflags} all
 
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-mkdir -p $RPM_BUILD_ROOT%{_infodir}
-make INSTALLROOT="$RPM_BUILD_ROOT" docdir=%{_docdir}/nasm-doc install_everything
+%make_install install_rdf
 mkdir -p included-docs
-cp -pr $RPM_BUILD_ROOT%{_docdir}/nasm-doc/* included-docs/
-rm -rf $RPM_BUILD_ROOT%{_docdir}/nasm-doc
 
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
-%post doc
-/sbin/install-info %{_infodir}/nasm.info.gz %{_infodir}/dir
-
-%preun doc
-if [ $1 = 0 ]; then
-  /sbin/install-info --delete %{_infodir}/nasm.info.gz %{_infodir}/dir
-fi
-
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS CHANGES ChangeLog INSTALL LICENSE README TODO
+%doc AUTHORS CHANGES README TODO
 %{_bindir}/nasm
 %{_bindir}/ndisasm
-%{_mandir}/man1/*.1.gz
+%{_mandir}/man1/nasm*
+%{_mandir}/man1/ndisasm*
 
 %files doc
 %defattr(-,root,root)
-%doc included-docs/*
-%{_infodir}/nasm.info*
+%doc doc/html
 
 %files rdoff
 %defattr(-,root,root)
 %doc rdoff/README
 %{_bindir}/ldrdf
 %{_bindir}/rdf2bin
-%{_bindir}/rdf2com
 %{_bindir}/rdf2ihx
-%{_bindir}/rdf2ith
-%{_bindir}/rdf2srec
+%{_bindir}/rdf2com
 %{_bindir}/rdfdump
 %{_bindir}/rdflib
 %{_bindir}/rdx
+%{_bindir}/rdf2ith
+%{_bindir}/rdf2srec
+%{_mandir}/man1/rd*
+%{_mandir}/man1/ld*
 
 %changelog
+* Thu Sep 19 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.14.02-1
+- new upstream release.
+
 * Sat Sep  5 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> nasm-2.11.08-1
 - updated nasm to nasm-2.11.08
 - updated xdoc to nasm-2.11.08-xdoc
@@ -203,7 +187,7 @@ fi
  - change URL
 - add BuildPrereq: perl
 
-* Tue Jan 27 2003 Masaki Shinomiya <shino@pos.to> 0.98.35-0vl1
+* Mon Jan 27 2003 Masaki Shinomiya <shino@pos.to> 0.98.35-0vl1
 - source upstream, new URL, doc files
 
 * Sat Apr 14 2001 Shoji Matsumoto <shom@vinelinux.org> 0.98-0vl2

p/python-mako/python-mako-vl.spec

@@ -1,19 +1,19 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
-Name: python-mako
-Version: 1.0.1
-Release: 1%{?_dist_release}
-Summary: Mako template library for Python
-Summary(ja): Python の Mako テンプレートライブラリ
-
-Group: Development/Languages
-License: MIT
-URL: http://www.makotemplates.org/
-Source0: http://www.makotemplates.org/downloads/Mako-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildArch: noarch
-BuildRequires: python-setuptools
-Requires: python-beaker
+Name:           python-mako
+Version:        1.1.0
+Release:        1%{?_dist_release}
+Summary:        Mako template library for Python
+Summary(ja):    Python の Mako テンプレートライブラリ
+Group:          Development/Libraries
+License:        MIT
+Vendor:         Project Vine
+Distribution:   Vine Linux
+URL:            http://www.makotemplates.org/
+Source0:        Mako-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildArch:      noarch
+BuildRequires:  python-rpm-macros
+BuildRequires:  python-setuptools
+Requires:       python-beaker
 
 %description
 Mako is a template library written in Python. It provides a familiar, non-XML
@@ -25,18 +25,37 @@ componentized layout and inheritance to produce one of the most straightforward
 and flexible models available, while also maintaining close ties to Python
 calling and scoping semantics.
 
+%package -n python3-mako
+Summary: Mako template library for Python3
+Summary(ja): Python3 の Mako テンプレートライブラリ
+Group: Development/Libraries
+BuildRequires: python3-rpm-macros
+BuildRequires: python3-setuptools
+Requires: python3-markupsafe
+
+%description -n python3-mako
+Mako is a template library written in Python. It provides a familiar, non-XML
+syntax which compiles into Python modules for maximum performance. Mako's
+syntax and API borrows from the best ideas of many others, including Django
+templates, Cheetah, Myghty, and Genshi. Conceptually, Mako is an embedded
+Python (i.e. Python Server Page) language, which refines the familiar ideas of
+componentized layout and inheritance to produce one of the most straightforward
+and flexible models available, while also maintaining close ties to Python
+calling and scoping semantics.
 
 %prep
 %setup -q -n Mako-%{version}
 
 
 %build
-%{__python} setup.py build
+%py_build
+%py3_build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%py_install
+%py3_install
 
  
 %clean
@@ -45,12 +64,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES LICENSE README.rst doc/ examples/
-%{_bindir}/mako-render
+%license LICENSE
+%doc CHANGES README.rst doc/ examples/
 %{python_sitelib}/*
 
+%files -n python3-mako
+%license LICENSE
+%doc CHANGES README.rst doc/ examples/
+%{_bindir}/mako-render
+%{python3_sitelib}/*
 
 %changelog
+* Fri Sep 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.1.0-1
+- new upstream release.
+- added python3 support.
+
 * Sat May 09 2015 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.0.1-1
 - new upstream release