upgrade toolchain + xserver-1.14.4

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

b/binutils/binutils-vl.spec

@@ -10,8 +10,8 @@
 Summary: A GNU collection of binary utilities.
 Summary(ja): GNU 版バイナリユーティリティ集
 Name: binutils
-Version: 2.22
+Version: 2.23.2
-Release: 3%{?_dist_release}
+Release: 1%{?_dist_release}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -27,11 +27,10 @@ Packager:       kenta, shaolin, inagaki
 Source: http://ftp.gnu.org/gnu/binutils/binutils-%{version}.tar.bz2
 Source2: binutils-2.19.50.0.1-output-format.sed
 Patch01: binutils-2.20.51.0.12-libtool-lib64.patch
-Patch02: binutils-2.20.51.0.12-ppc64-pie.patch
 Patch03: binutils-2.20.51.0.2-ia64-lib64.patch
 Patch04: binutils-2.20.51.0.12-version.patch
 Patch05: binutils-2.20.51.0.2-set-long-long.patch
-Patch06: binutils-2.22-build-id.patch
+Patch06: binutils-2.23.2-build-id.patch
 Patch07: binutils-2.20.51.0.12-copy-osabi.patch
 Patch08: binutils-2.20.51.0.12-sec-merge-emit.patch
 
@@ -121,7 +120,6 @@ to consider using libelf instead of BFD.
 %prep
 %setup -q
 %patch01 -p0 -b .libtool-lib64~
-%patch02 -p0 -b .ppc64-pie~
 %ifarch ia64
 %if "%{_lib}" == "lib64"
 %patch03 -p0 -b .ia64-lib64~
@@ -129,7 +127,7 @@ to consider using libelf instead of BFD.
 %endif
 %patch04 -p0 -b .version~
 %patch05 -p0 -b .set-long-long~
-%patch06 -p0 -b .build-id~
+%patch06 -p1 -b .build-id~
 %patch07 -p0 -b .copy-osabi~
 %patch08 -p0 -b .sec-merge-emit~
 
@@ -413,6 +411,11 @@ fi
 
 
 %changelog
+* Mon Nov 04 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 2.23.2-1
+- update to 2.23.2
+- remove Patch02 (binutils-2.20.51.0.12-ppc64-pie.patch)
+- update Patch06 (binutils-2.23.2-build-id.patch)
+
 * Tue Oct 01 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 2.22-3
 - rebuild with gcc-4.8.1
 

g/gcc/gcc-vl.spec

@@ -1,7 +1,7 @@
-%global gcc_version 4.8.1
+%global gcc_version 4.8.2
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 2%{?_dist_release}
+%global gcc_release 1%{?_dist_release}
 %global _unpackaged_files_terminate_build 0
 %global multilib_64_archs sparc64 ppc64 s390x x86_64
 # %ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha
@@ -1298,7 +1298,8 @@ FULLEPATH=$RPM_BUILD_ROOT%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_ver
 # fix some things
 ln -sf gcc $RPM_BUILD_ROOT%{_prefix}/bin/cc
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib/cpp
-ln -sf ../bin/cpp $RPM_BUILD_ROOT%{_prefix}/lib/cpp
+mkdir -p $RPM_BUILD_ROOT/lib
+ln -sf %{_prefix}/bin/cpp $RPM_BUILD_ROOT/lib/cpp
 ln -sf gfortran $RPM_BUILD_ROOT%{_prefix}/bin/f95
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 gzip -9 $RPM_BUILD_ROOT%{_infodir}/*.info*
@@ -1492,7 +1493,7 @@ ln -sf ../../../libgomp.so.1.* libgomp.so
 ln -sf ../../../libmudflap.so.0.* libmudflap.so
 ln -sf ../../../libmudflapth.so.0.* libmudflapth.so
 %if %{build_go}
-ln -sf ../../../libgo.so.3.* libgo.so
+ln -sf ../../../libgo.so.4.* libgo.so
 %endif
 %if %{build_libquadmath}
 ln -sf ../../../libquadmath.so.0.* libquadmath.so
@@ -1508,9 +1509,9 @@ ln -sf ../../../libasan.so.0.* libasan.so
 mv ../../../libasan_preinit.o libasan_preinit.o
 %endif
 %if %{build_java}
-ln -sf ../../../libgcj.so.12.* libgcj.so
+ln -sf ../../../libgcj.so.14.* libgcj.so
-ln -sf ../../../libgcj-tools.so.12.* libgcj-tools.so
+ln -sf ../../../libgcj-tools.so.14.* libgcj-tools.so
-ln -sf ../../../libgij.so.12.* libgij.so
+ln -sf ../../../libgij.so.14.* libgij.so
 %endif
 else
 ln -sf ../../../../%{_lib}/libobjc.so.4 libobjc.so
@@ -1520,7 +1521,7 @@ ln -sf ../../../../%{_lib}/libgomp.so.1.* libgomp.so
 ln -sf ../../../../%{_lib}/libmudflap.so.0.* libmudflap.so
 ln -sf ../../../../%{_lib}/libmudflapth.so.0.* libmudflapth.so
 %if %{build_go}
-ln -sf ../../../../%{_lib}/libgo.so.3.* libgo.so
+ln -sf ../../../../%{_lib}/libgo.so.4.* libgo.so
 %endif
 %if %{build_libquadmath}
 ln -sf ../../../../%{_lib}/libquadmath.so.0.* libquadmath.so
@@ -1540,9 +1541,9 @@ rm -f libtsan.so
 echo 'INPUT ( %{_prefix}/%{_lib}/'`echo ../../../../%{_lib}/libtsan.so.0.* | sed 's,^.*libt,libt,'`' )' > libtsan.so
 %endif
 %if %{build_java}
-ln -sf ../../../../%{_lib}/libgcj.so.12.* libgcj.so
+ln -sf ../../../../%{_lib}/libgcj.so.14.* libgcj.so
-ln -sf ../../../../%{_lib}/libgcj-tools.so.12.* libgcj-tools.so
+ln -sf ../../../../%{_lib}/libgcj-tools.so.14.* libgcj-tools.so
-ln -sf ../../../../%{_lib}/libgij.so.12.* libgij.so
+ln -sf ../../../../%{_lib}/libgij.so.14.* libgij.so
 %endif
 fi
 %if %{build_java}
@@ -1647,8 +1648,8 @@ echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libmudflap.so.0.* | sed 's
 echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libmudflapth.so.0.* | sed 's,^.*libm,libm,'`' )' > 64/libmudflapth.so
 %if %{build_go}
 rm -f libgo.so
-echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgo.so.3.* | sed 's,^.*libg,libg,'`' )' > libgo.so
+echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgo.so.4.* | sed 's,^.*libg,libg,'`' )' > libgo.so
-echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgo.so.3.* | sed 's,^.*libg,libg,'`' )' > 64/libgo.so
+echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgo.so.4.* | sed 's,^.*libg,libg,'`' )' > 64/libgo.so
 %endif
 %if %{build_libquadmath}
 rm -f libquadmath.so
@@ -1672,9 +1673,9 @@ echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libasan.so.0.* | sed 's,^.
 mv ../../../../lib64/libasan_preinit.o 64/libasan_preinit.o
 %endif
 %if %{build_java}
-ln -sf ../`echo ../../../../lib/libgcj.so.12.* | sed s~/lib/~/lib64/~` 64/libgcj.so
+ln -sf ../`echo ../../../../lib/libgcj.so.14.* | sed s~/lib/~/lib64/~` 64/libgcj.so
-ln -sf ../`echo ../../../../lib/libgcj-tools.so.12.* | sed s~/lib/~/lib64/~` 64/libgcj-tools.so
+ln -sf ../`echo ../../../../lib/libgcj-tools.so.14.* | sed s~/lib/~/lib64/~` 64/libgcj-tools.so
-ln -sf ../`echo ../../../../lib/libgij.so.12.* | sed s~/lib/~/lib64/~` 64/libgij.so
+ln -sf ../`echo ../../../../lib/libgij.so.14.* | sed s~/lib/~/lib64/~` 64/libgij.so
 ln -sf lib/libgcj_bc.so libgcj_bc.so
 ln -sf ../lib64/libgcj_bc.so 64/libgcj_bc.so
 %endif
@@ -1732,8 +1733,8 @@ echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libmudflap.so.0.* | sed 's
 echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libmudflapth.so.0.* | sed 's,^.*libm,libm,'`' )' > 32/libmudflapth.so
 %if %{build_go}
 rm -f libgo.so
-echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgo.so.3.* | sed 's,^.*libg,libg,'`' )' > libgo.so
+echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgo.so.4.* | sed 's,^.*libg,libg,'`' )' > libgo.so
-echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgo.so.3.* | sed 's,^.*libg,libg,'`' )' > 32/libgo.so
+echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgo.so.4.* | sed 's,^.*libg,libg,'`' )' > 32/libgo.so
 %endif
 %if %{build_libquadmath}
 rm -f libquadmath.so
@@ -1834,7 +1835,7 @@ chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libasan.so.0.*
 chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libtsan.so.0.*
 %endif
 %if %{build_go}
-chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgo.so.3.*
+chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgo.so.4.*
 %endif
 chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libobjc.so.4.*
 
@@ -2377,7 +2378,7 @@ fi
 
 %files cpp -f cpplib.lang
 %defattr(-,root,root,-)
-%{_prefix}/lib/cpp
+/lib/cpp
 %{_prefix}/bin/cpp
 %{_mandir}/man1/cpp.1*
 %{_infodir}/cpp*
@@ -3058,9 +3059,9 @@ fi
 
 %files -n libgo
 %defattr(-,root,root,-)
-%{_prefix}/%{_lib}/libgo.so.3*
+%{_prefix}/%{_lib}/libgo.so.4*
 %ifarch %{multilib_64_archs}
-%{_prefix}/lib/libgo.so.3*
+%{_prefix}/lib/libgo.so.4*
 %endif
 %doc rpm.doc/libgo/*
 
@@ -3118,6 +3119,9 @@ fi
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/plugin
 
 %changelog
+* Mon Nov 04 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.8.2-1
+- updated to 4.8.2
+
 * Mon Sep 30 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.8.1-2
 - change source (original)
 

g/glibc/glibc-vl.spec

@@ -1,6 +1,7 @@
-%define glibcversion 2.14.1
+%define glibcversion 2.18
 %define glibcsrcdir glibc-%{glibcversion}
-%define glibcportsdir glibc-ports-%{glibcversion}
+#%define glibcportsdir glibc-ports-%{glibcversion}
+%define glibcportsdir ports
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
@@ -32,7 +33,7 @@ Summary: The GNU libc libraries
 Summary(ja): GNU libc ライブラリ
 Name: glibc
 Version: %{glibcversion}
-Release: 4%{?_dist_release}
+Release: 1%{?_dist_release}
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -42,24 +43,38 @@ License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnu.org/software/glibc/
 Source0: %{?glibc_release_url}%{glibcsrcdir}.tar.xz
-Source1: %{?glibc_release_url}%{glibcportsdir}.tar.xz
+Source1: build-locale-archive.c
-Source2: %{glibcsrcdir}-fedora.tar.xz
+Source2: glibc_post_upgrade.c
+Source3: libc-lock.h
+Source7: nsswitch.conf.vine
 Source10: find_provides_glibc.sh
 Source11: find_requires_glibc.sh
-Patch0: %{name}-fedora.patch
+
-Patch1: %{name}-%{version}-locarchive.patch
+
-Patch2: %{name}-%{version}-sysdep-ASFLAGS.patch
+# patches from Fedora
-Patch3: %{name}-%{version}-locales-dir.patch
+Patch11: %{name}-2.18-nptl-linklibc.patch
-# Patch4: %{name}-no-leaf-attribute.patch
+Patch12: %{name}-2.18-localedef.patch
-# Patch5: %{name}-arenalock.patch
+Patch13: %{name}-2.18-locarchive.patch
-# Patch6: %{name}-rh757881.patch
+
-
+# rtkaio and c_stubs.  Note that despite the numbering, these are always
-# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873
+# applied first.
-Patch10: glibc-2.14-reexport-rpc-interface.patch
+Patch14: %{name}-rtkaio.patch
-# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3
+Patch15: %{name}-c_stubs.patch
-Patch11: glibc-2.14-reinstall-nis-rpc-headers.patch
+
-#http://sourceware.org/bugzilla/attachment.cgi?id=6024&action=diff
+# Remove non-ELF support in rtkaio
-Patch12: glibc-fix-do_lookup_x.patch
+Patch16: %{name}-rh731833-rtkaio.patch
+Patch17: %{name}-rh731833-rtkaio-2.patch
+Patch18: %{name}-rh970865.patch
+
+#
+# Patches from upstream
+#
+Patch19: %{name}-rh995841.patch
+
+
+# patch for Vine
+Patch10001: glibc-2.18-vine-build-env.patch
+
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: glibc-profile < 2.4
@@ -81,10 +96,19 @@ BuildRequires: gcc >= 3.2
 Conflicts: kernel < %{enablekernel}
 %define enablekernel 2.6.18
 %ifarch i386
-%define nptl_target_cpu i486
+%define target_cpu i486
 %else
-%define nptl_target_cpu %{_target_cpu}
+%define target_cpu %{_target_cpu}
+%endif
+
+%define target %{_target_cpu}-vine-linux
+%ifarch %{arm}
+%define target %{_target_cpu}-vine-linuxeabi
 %endif
+%ifarch %{power64}
+%define target ppc64-vine-linux
+%endif
+
 %ifarch %{multiarcharches}
 # Need STT_IFUNC support
 %ifarch ppc ppc64
@@ -109,6 +133,13 @@ BuildRequires: gcc >= 4.1.0-0.17
 BuildRequires: elfutils >= 0.72
 BuildRequires: rpm >= 4.2-0.56
 %endif
+
+# The testsuite builds static C++ binaries that require a static
+# C++ runtime from libstdc++-static.
+BuildRequires: libstdc++-static
+
+BuildRequires: tzdata
+
 %define __find_provides %{SOURCE10}
 %define __find_requires %{SOURCE11}
 %define _filter_GLIBC_PRIVATE 1
@@ -411,15 +442,20 @@ package or when debugging this package.
 
 %prep
 rm -rf %{glibcportsdir}
-%setup -q -n %{glibcsrcdir} -b1 -b2
+%setup -q -n %{glibcsrcdir}
-# %patch0 -E -p1
+
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-# %patch4 -p1
-%patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+
+%patch10001 -p1
+
 
 # A lot of programs still misuse memcpy when they have to use
 # memmove. The memcpy implementation below is not tolerant at
@@ -440,7 +476,7 @@ touch locale/programs/*-kw.h
 GCC=gcc
 GXX=g++
 %ifarch %{ix86}
-BuildFlags="-march=%{nptl_target_cpu} -mtune=generic"
+BuildFlags="-march=%{target_cpu} -mtune=generic"
 %endif
 %ifarch i686
 BuildFlags="-march=i686 -mtune=generic"
@@ -500,37 +536,41 @@ AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkai
 AddOns=,rtkaio$AddOns
 %endif
 
-build_nptl()
+build()
 {
-builddir=build-%{nptl_target_cpu}-$1
+builddir=build-%{target}${1:+-$1}
-shift
+${1+shift}
 rm -rf $builddir
-mkdir $builddir ; cd $builddir
+mkdir $builddir
+pushd $builddir
 build_CFLAGS="$BuildFlags -g -O3 $*"
 # Some configure checks can spuriously fail for some architectures if
 # unwind info is present
 configure_CFLAGS="$build_CFLAGS -fno-asynchronous-unwind-tables"
 ../configure CC="$GCC" CXX="$GXX" CFLAGS="$configure_CFLAGS" \
 	--prefix=%{_prefix} \
-	--enable-add-ons=../%{glibcportsdir},nptl$AddOns $EnableKernel \
+	--enable-add-ons=%{glibcportsdir},nptl$AddOns $EnableKernel \
 	--with-headers=%{_prefix}/include --enable-bind-now \
-	--build %{nptl_target_cpu}-vine-linux \
+	--build %{target} \
-	--host %{nptl_target_cpu}-vine-linux \
+	--host %{target} \
+	--enable-pt_chown \
 %ifarch %{multiarcharches}
 	--enable-multi-arch \
 %endif
+	--enable-obsolete-rpc \
+	--enable-lock-elision \
 	--disable-profile --enable-nss-crypt ||
 { cat config.log; false; }
 
 make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
 
-cd ..
+popd
 }
 
-build_nptl linuxnptl
+build
 
 %if %{buildxen}
-build_nptl linuxnptl-nosegneg -mno-tls-direct-seg-refs
+build nosegneg -mno-tls-direct-seg-refs
 %endif
 
 %if %{buildpower6}
@@ -550,28 +590,28 @@ fi
 AddOns="$AddOns --with-cpu=power6"
 GCC="$GCC -mcpu=power6"
 GXX="$GXX -mcpu=power6"
-build_nptl linuxnptl-power6
+build power6
 )
 %endif
 
-cd build-%{nptl_target_cpu}-linuxnptl
+pushd build-%{target}
-$GCC -static -L. -Os -g ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_target_cpu} \
+$GCC -static -L. -Os -g %{SOURCE2} \
-  -DNO_SIZE_OPTIMIZATION \
+	-o glibc_post_upgrade.%{_target_cpu} \
-  '-DLIBTLS="/%{_lib}/tls/"' \
+	'-DLIBTLS="/%{_lib}/tls/"' \
-  '-DGCONV_MODULES_DIR="%{_prefix}/%{_lib}/gconv"' \
+	'-DGCONV_MODULES_DIR="%{_libdir}/gconv"' \
-  '-DLD_SO_CONF="/etc/ld.so.conf"' \
+	'-DLD_SO_CONF="/etc/ld.so.conf"' \
-  '-DICONVCONFIG="%{_sbindir}/iconvconfig.%{_target_cpu}"'
+	'-DICONVCONFIG="%{_sbindir}/iconvconfig.%{_target_cpu}"'
-cd ..
+popd
 
 %install
 GCC=`cat Gcc`
 
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
-make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{nptl_target_cpu}-linuxnptl PARALLELMFLAGS=-s
+make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{target} PARALLELMFLAGS=-s
 chmod +x $RPM_BUILD_ROOT%{_prefix}/libexec/pt_chown
 %ifnarch %{auxarches}
-cd build-%{nptl_target_cpu}-linuxnptl && \
+cd build-%{target} && \
   make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \
   cd ..
 %endif
@@ -588,68 +628,88 @@ ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` $RPM_BUILD_ROOT/%{_lib}/$li
 ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/librtkaio-*.so` $RPM_BUILD_ROOT/%{_lib}/rtkaio/$librtso
 %endif
 
+install_different()
+{
+        local lib libbase libbaseso dlib
+        local destdir="$1"
+        local subdir="$2"
+        local subdir_up="$3"
+        local libdestdir="$destdir/$subdir"
+        # All three arguments must be non-zero paths.
+        if ! [ "$destdir" \
+               -a "$subdir" \
+               -a "$subdir_up" ]; then
+                echo "One of the arguments to install_different was emtpy."
+                exit 1
+        fi
+        # Create the destination directory and the multilib directory.
+        mkdir -p "$destdir"
+        mkdir -p "$libdestdir"
+        # Walk all of the libraries we installed...
+        for lib in libc math/libm nptl/libpthread rt/librt nptl_db/libthread_db
+        do
+                libbase=${lib#*/}
+                # Take care that `libbaseso' has a * that needs expanding so
+                # take care with quoting.
+                libbaseso=$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}-*.so)
+                # Only install if different from default build library.
+                if cmp -s ${lib}.so ../build-%{target}/${lib}.so; then
+                        ln -sf "$subdir_up"/$libbaseso $libdestdir/$libbaseso
+                else
+                        cp -a ${lib}.so $libdestdir/$libbaseso
+                fi
+                dlib=$libdestdir/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
+                ln -sf $libbaseso $dlib
+        done
+%ifarch %{rtkaioarches}
+        local rtkdestdir="$RPM_BUILD_ROOT/%{_lib}/rtkaio/$subdir"
+        local librtso=`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*`
+        mkdir -p $rtkdestdir
+        librtkaioso=$(basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/)
+        if cmp -s rtkaio/librtkaio.so ../build-%{target}/rtkaio/librtkaio.so; then
+                ln -s %{nosegneg_subdir_up}/$librtkaioso $rtkdestdir/$librtkaioso
+        else
+                cp -a rtkaio/librtkaio.so $rtkdestdir/$librtkaioso
+        fi
+        ln -sf $librtkaioso $rtkdestdir/$librtso
+%endif
+}
+
 %if %{buildxen}
 %define nosegneg_subdir_base i686
 %define nosegneg_subdir i686/nosegneg
 %define nosegneg_subdir_up ../..
-cd build-%{nptl_target_cpu}-linuxnptl-nosegneg
+pushd build-%{target}-nosegneg
-destdir=$RPM_BUILD_ROOT/%{_lib}/%{nosegneg_subdir}
+destdir=$RPM_BUILD_ROOT/%{_lib}
-mkdir -p $destdir
+install_different "$destdir" "%{nosegneg_subdir}" "%{nosegneg_subdir_up}"
-for lib in libc math/libm nptl/libpthread rt/librt nptl_db/libthread_db
+popd
-do
-  libbase=${lib#*/}
-  libbaseso=$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}-*.so)
-  # Only install if different from base lib
-  if cmp -s ${lib}.so ../build-%{nptl_target_cpu}-linuxnptl/${lib}.so; then
-    ln -sf %{nosegneg_subdir_up}/$libbaseso $destdir/$libbaseso
-  else
-    cp -a ${lib}.so $destdir/$libbaseso
-  fi
-  ln -sf $libbaseso $destdir/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
-done
-%ifarch %{rtkaioarches}
-destdir=$RPM_BUILD_ROOT/%{_lib}/rtkaio/%{nosegneg_subdir}
-mkdir -p $destdir
-librtkaioso=$(basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/)
-if cmp -s rtkaio/librtkaio.so ../build-%{nptl_target_cpu}-linuxnptl/rtkaio/librtkaio.so; then
-  ln -s %{nosegneg_subdir_up}/$librtkaioso $destdir/$librtkaioso
-else
-  cp -a rtkaio/librtkaio.so $destdir/$librtkaioso
-fi
-ln -sf $librtkaioso $destdir/$librtso
-%endif
-cd ..
 %endif
 
 %if %{buildpower6}
-cd build-%{nptl_target_cpu}-linuxnptl-power6
+%define power6_subdir power6
-destdir=$RPM_BUILD_ROOT/%{_lib}/power6
+%define power6_subdir_up ..
-mkdir -p ${destdir}
+%define power6_legacy power6x
-for lib in libc math/libm nptl/libpthread rt/librt nptl_db/libthread_db
+%define power6_legacy_up ..
-do
+pushd build-%{target}-power6
-  libbase=${lib#*/}
+destdir=$RPM_BUILD_ROOT/%{_lib}
-  libbaseso=$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}-*.so)
+install_different "$destdir" "%{power6_subdir}" "%{power6_subdir_up}"
-  cp -a ${lib}.so $destdir/$libbaseso
+# Make a legacy /usr/lib[64]/power6x directory that is a symlink to the
-  ln -sf $libbaseso $destdir/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
+# power6 runtime.
-done
+# XXX: When can we remove this? What is the history behind this?
-mkdir -p ${destdir}x
+mkdir -p ${destdir}/%{power6_legacy}
-pushd ${destdir}x
+pushd ${destdir}/%{power6_legacy}
-ln -sf ../power6/*.so .
+ln -sf %{power6_legacy_up}/%{power6_subdir}/*.so .
-cp -a ../power6/*.so.* .
+cp -a %{power6_legacy_up}/%{power6_subdir}/*.so.* .
 popd
 %ifarch %{rtkaioarches}
-destdir=$RPM_BUILD_ROOT/%{_lib}/rtkaio/power6
+destdir=${destdir}/rtkaio
-mkdir -p $destdir
+mkdir -p ${destdir}/%{power6_legacy}
-librtkaioso=$(basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/)
+pushd ${destdir}/%{power6_legacy}
-cp -a rtkaio/librtkaio.so $destdir/$librtkaioso
-ln -sf $librtkaioso $destdir/$librtso
-mkdir -p ${destdir}x
-pushd ${destdir}x
 ln -sf ../power6/*.so .
 cp -a ../power6/*.so.* .
 popd
 %endif
-cd ..
+popd
 %endif
 
 # Remove the files we don't want to distribute
@@ -660,7 +720,7 @@ rm -f $RPM_BUILD_ROOT/%{_lib}/libNoVersion*
 # the generic one (#162634)
 cp -a bits/stdio-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/stdio-lock.h
 # And <bits/libc-lock.h> needs sanitizing as well.
-cp -a fedora/libc-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/libc-lock.h
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_prefix}/include/bits/libc-lock.h
 
 if [ -d $RPM_BUILD_ROOT%{_prefix}/info -a "%{_infodir}" != "%{_prefix}/info" ]; then
   mkdir -p $RPM_BUILD_ROOT%{_infodir}
@@ -672,7 +732,7 @@ gzip -9nvf $RPM_BUILD_ROOT%{_infodir}/libc*
 
 ln -sf libbsd-compat.a $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libbsd.a
 
-install -p -m 644 fedora/nsswitch.conf $RPM_BUILD_ROOT/etc/nsswitch.conf
+install -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT/etc/nsswitch.conf
 
 mkdir -p $RPM_BUILD_ROOT/etc/default
 install -p -m 644 nis/nss $RPM_BUILD_ROOT/etc/default/nss
@@ -696,7 +756,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
 chmod 644 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gconv/gconv-modules.cache
 
 # Install the upgrade program
-install -m 700 build-%{nptl_target_cpu}-linuxnptl/glibc_post_upgrade.%{_target_cpu} \
+install -m 700 build-%{target}/glibc_post_upgrade.%{_target_cpu} \
   $RPM_BUILD_ROOT/usr/sbin/glibc_post_upgrade.%{_target_cpu}
 
 strip -g $RPM_BUILD_ROOT%{_prefix}/%{_lib}/*.o
@@ -716,17 +776,17 @@ pushd ${RPM_BUILD_ROOT}%{_prefix}/lib/locale
 rm locale-archive || :
 # Intentionally we do not pass --alias-file=, aliases will be added
 # by build-locale-archive.
-$olddir/build-%{nptl_target_cpu}-linuxnptl/elf/ld.so \
+$olddir/build-%{target}/elf/ld.so \
-  --library-path $olddir/build-%{nptl_target_cpu}-linuxnptl/ \
+        --library-path $olddir/build-%{target}/ \
-  $olddir/build-%{nptl_target_cpu}-linuxnptl/locale/localedef \
+		$olddir/build-%{target}/locale/localedef \
-    --prefix ${RPM_BUILD_ROOT} --add-to-archive \
+		--prefix ${RPM_BUILD_ROOT} --add-to-archive \
-    *_*
+		*_*
 mv locale-archive{,-extra.tmpl}
-$olddir/build-%{nptl_target_cpu}-linuxnptl/elf/ld.so \
+$olddir/build-%{target}/elf/ld.so \
-  --library-path $olddir/build-%{nptl_target_cpu}-linuxnptl/ \
+        --library-path $olddir/build-%{target}/ \
-  $olddir/build-%{nptl_target_cpu}-linuxnptl/locale/localedef \
+		$olddir/build-%{target}/locale/localedef \
-    --prefix ${RPM_BUILD_ROOT} --add-to-archive \
+		--prefix ${RPM_BUILD_ROOT} --add-to-archive \
-    ja_JP* en_US*
+		ja_JP* en_US*
 mv locale-archive{,.tmpl}
 cp -a locale-archive{.tmpl,-ja.tmpl}
 rm -rf *_*
@@ -816,7 +876,7 @@ grep '%{_prefix}/share' < rpm.filelist | \
 
 sed -i -e '\|%{_prefix}/bin|d' \
        -e '\|%{_prefix}/lib/locale|d' \
-       -e '\|%{_prefix}/libexec/pt_chown|d' \
+	   -e '\|%{_prefix}/libexec/pt_chown|d' \
        -e '\|%{_prefix}/sbin/[^gi]|d' \
        -e '\|%{_prefix}/share|d' rpm.filelist
 
@@ -845,29 +905,25 @@ EOF
 
 # /etc/localtime
 rm -f $RPM_BUILD_ROOT/etc/localtime
-##VINE##cp -f $RPM_BUILD_ROOT%{_prefix}/share/zoneinfo/US/Eastern $RPM_BUILD_ROOT/etc/localtime
+cp -f %{_datadir}/zoneinfo/Asia/Tokyo $RPM_BUILD_ROOT/etc/localtime
-cp -f $RPM_BUILD_ROOT%{_prefix}/share/zoneinfo/Asia/Tokyo $RPM_BUILD_ROOT/etc/localtime
 
 rm -rf $RPM_BUILD_ROOT%{_prefix}/share/zoneinfo
 
 # Make sure %config files have the same timestamp
-touch -r fedora/glibc.spec.in $RPM_BUILD_ROOT/etc/ld.so.conf
+touch -r %{SOURCE2} $RPM_BUILD_ROOT/etc/ld.so.conf
-touch -r timezone/northamerica $RPM_BUILD_ROOT/etc/localtime
+touch -r %{_datadir}/zoneinfo/Asia/Tokyo $RPM_BUILD_ROOT/etc/localtime
 touch -r sunrpc/etc.rpc $RPM_BUILD_ROOT/etc/rpc
 
-cd fedora
+pushd build-%{target}
-$GCC -Os -g -o build-locale-archive build-locale-archive.c \
+$GCC -Os -g -o build-locale-archive %{SOURCE1} \
-  ../build-%{nptl_target_cpu}-linuxnptl/locale/locarchive.o \
+	../build-%{target}/locale/locarchive.o \
-  ../build-%{nptl_target_cpu}-linuxnptl/locale/md5.o \
+	../build-%{target}/locale/md5.o \
-  -DDATADIR=\"%{_datadir}\" -DPREFIX=\"%{_prefix}\" \
+	-I. -DDATADIR=\"%{_datadir}\" -DPREFIX=\"%{_prefix}\" \
-  -L../build-%{nptl_target_cpu}-linuxnptl \
+	-L../build-%{target} \
-  -B../build-%{nptl_target_cpu}-linuxnptl/csu/ -lc -lc_nonshared
+	-Wl,--allow-shlib-undefined \
+	-B../build-%{target}/csu/ -lc -lc_nonshared
 install -m 700 build-locale-archive $RPM_BUILD_ROOT/usr/sbin/build-locale-archive
-# Convert tzdata-update to lua
+popd
-# $GCC -Os -g -static -o tzdata-update tzdata-update.c \
-#   -L../build-%{nptl_target_cpu}-linuxnptl
-# install -m 700 tzdata-update $RPM_BUILD_ROOT/usr/sbin/tzdata-update
-cd ..
 
 # the last bit: more documentation
 rm -rf documentation
@@ -892,31 +948,32 @@ ln -sf /%{_lib}/ld-linux-ia64.so.2 $RPM_BUILD_ROOT/lib/ld-linux-ia64.so.2
 %endif
 
 %if %{run_glibc_tests}
-
 # Increase timeouts
 export TIMEOUTFACTOR=16
 parent=$$
 echo ====================TESTING=========================
-cd build-%{nptl_target_cpu}-linuxnptl
+pushd build-%{target}
 ( make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
   sleep 10s
   teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
   [ -n "$teepid" ] && kill $teepid
 ) | tee check.log || :
-cd ..
+popd
+
 %if %{buildxen}
 echo ====================TESTING -mno-tls-direct-seg-refs=============
-cd build-%{nptl_target_cpu}-linuxnptl-nosegneg
+pushd build-%{target}-nosegneg
 ( make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
   sleep 10s
   teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
   [ -n "$teepid" ] && kill $teepid
 ) | tee check.log || :
-cd ..
+popd
 %endif
+
 %if %{buildpower6}
 echo ====================TESTING -mcpu=power6=============
-cd build-%{nptl_target_cpu}-linuxnptl-power6
+pushd build-%{target}-power6
 ( if [ -d ../power6emul ]; then
     export LD_PRELOAD=`cd ../power6emul; pwd`/\$LIB/power6emul.so
   fi
@@ -925,7 +982,7 @@ cd build-%{nptl_target_cpu}-linuxnptl-power6
   teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
   [ -n "$teepid" ] && kill $teepid
 ) | tee check.log || :
-cd ..
+popd
 %endif
 echo ====================TESTING DETAILS=================
 for i in `sed -n 's|^.*\*\*\* \[\([^]]*\.out\)\].*$|\1|p' build-*-linux*/check.log`; do
@@ -943,20 +1000,37 @@ echo ====================PLT RELOCS END==================
 
 %endif
 
+###############################################################################
+# Rebuild libpthread.a using --whole-archive to ensure all of libpthread
+# is included in a static link. This prevents any problems when linking
+# statically, using parts of libpthread, and other necessary parts not
+# being included. Upstream has decided that this is the wrong approach to
+# this problem and that the full set of dependencies should be resolved
+# such that static linking works and produces the most minimally sized
+# static application possible.
+###############################################################################
 pushd $RPM_BUILD_ROOT/usr/%{_lib}/
 $GCC -r -nostdlib -o libpthread.o -Wl,--whole-archive ./libpthread.a
 rm libpthread.a
 ar rcs libpthread.a libpthread.o
 rm libpthread.o
 popd
+###############################################################################
 
 %if 0%{?_enable_debug_packages}
 
 # The #line directives gperf generates do not give the proper
 # file name relative to the build directory.
-(cd locale; ln -s programs/*.gperf .)
+pushd locale
-(cd iconv; ln -s ../locale/programs/charmap-kw.gperf .)
+ln -s programs/*.gperf .
+popd
+pushd iconv
+ln -s ../locale/programs/charmap-kw.gperf .
+popd
 
+# Print some diagnostic information in the builds about the
+# getconf binaries.
+# XXX: Why do we do this?
 ls -l $RPM_BUILD_ROOT/usr/bin/getconf
 ls -l $RPM_BUILD_ROOT/usr/libexec/getconf
 eu-readelf -hS $RPM_BUILD_ROOT/usr/bin/getconf $RPM_BUILD_ROOT/usr/libexec/getconf/*
@@ -991,28 +1065,43 @@ list_debug_archives()
 %define basearch sparc
 %endif
 
-sed -i '\#^%{_prefix}/src/debug/#d' debuginfocommon.filelist
+# The auxarches get only these few source files.
-find $RPM_BUILD_ROOT%{_prefix}/src/debug \
-     \( -type d -printf '%%%%dir ' \) , \
-     -printf '%{_prefix}/src/debug/%%P\n' > debuginfocommon.sources
-
-# auxarches get only these few source files
 auxarches_debugsources=\
 '/(generic|linux|%{basearch}|nptl(_db)?)/|/%{glibcsrcdir}/build|/dl-osinfo\.h'
 
+# Place the source files into the core debuginfo pakcage.
 egrep "$auxarches_debugsources" debuginfocommon.sources >> debuginfo.filelist
 
+# Remove the source files from the common debuginfo package.
 egrep -v "$auxarches_debugsources" \
   debuginfocommon.sources >> debuginfocommon.filelist
 
-%endif
+%endif # %{biarcharches}
 
+# Add the list of *.a archives in the debug directory to
+# the common debuginfo package.
 list_debug_archives >> debuginfocommon.filelist
 
-%endif
+# It happens that find-debuginfo.sh produces duplicate entries even
-
+# though the inputs are unique. Therefore we sort and unique the
+# entries in the debug file lists. This avoids the following warnings:
+# ~~~
+# Processing files: glibc-debuginfo-common-2.17.90-10.fc20.x86_64
+# warning: File listed twice: /usr/lib/debug/usr/sbin/build-locale-archive.debug
+# warning: File listed twice: /usr/lib/debug/usr/sbin/nscd.debug
+# warning: File listed twice: /usr/lib/debug/usr/sbin/zdump.debug
+# warning: File listed twice: /usr/lib/debug/usr/sbin/zic.debug
+# ~~~
+sort -u debuginfocommon.filelist > debuginfocommon2.filelist
+mv debuginfocommon2.filelist debuginfocommon.filelist
+
+%endif # 0%{?_enable_debug_packages}
+
+# Remove the `dir' info-heirarchy file which will be maintained
+# by the system as it adds info files to the install.
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
+
 %ifarch %{auxarches}
 
 echo Cutting down the list of unpackaged files
@@ -1153,6 +1242,7 @@ if posix.access("/etc/ld.so.cache") then
   end
 end
 
+
 %post devel
 /sbin/install-info %{_infodir}/libc.info.gz %{_infodir}/dir > /dev/null 2>&1 || :
 
@@ -1245,8 +1335,8 @@ rm -f *.filelist*
 %attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/cache/ldconfig/aux-cache
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/ld.so.cache
 %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/gai.conf
-%doc README NEWS INSTALL FAQ BUGS NOTES PROJECTS CONFORMANCE
+%doc README NEWS INSTALL BUGS PROJECTS CONFORMANCE
-%doc COPYING COPYING.LIB README.libm LICENSES
+%doc COPYING COPYING.LIB LICENSES
 %doc hesiod/README.hesiod
 
 %if %{build_compat32}
@@ -1340,6 +1430,12 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Nov 04 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.18-1
+- update to 2.18
+- merged with FC 2.18-6.fc21
+- add Source1,2,3 and Patch11,12,13,14,15,16,17,18,19 from Fedora
+- add Patch10001 for vine
+
 * Tue Oct 01 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.14.1-4
 - rebuild with gcc-4.8.1
 
@@ -1593,7 +1689,7 @@ rm -f *.filelist*
 * Thu Jul  2 2009 Andreas Schwab <aschwab@redhat.com> 2.10.90-2
 - Update from master.
 
-* Thu Jun 26 2009 Andreas Schwab <aschwab@redhat.com> 2.10.90-1
+* Fri Jun 26 2009 Andreas Schwab <aschwab@redhat.com> 2.10.90-1
 - Update from master.
 - Enable multi-arch support on x86/x86-64.
 - Add requires glibc-headers to glibc-devel (#476295).
@@ -2281,7 +2377,7 @@ rm -f *.filelist*
 - fix l{,l}rint{,f,l} around zero (BZ#2592)
 - avoid stack trampoline in s390{,x} makecontext
 
-* Tue Sep 15 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-33
+* Fri Sep 15 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-33
 - fix dlclose (#206639)
 - don't load platform optimized libraries if kernel doesn't set
   AT_PLATFORM
@@ -2384,7 +2480,7 @@ rm -f *.filelist*
 - disallow RTLD_GLOBAL flag for dlmopen in secondary namespaces (#197462)
 - PI mutex support
 
-* Tue Jul 10 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-13
+* Mon Jul 10 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-13
 - DT_GNU_HASH support
 
 * Fri Jun 30 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-12
@@ -2833,7 +2929,7 @@ rm -f *.filelist*
   - grok PT_NOTE in vDSO for kernel version and extra hwcap dirs,
     support "hwcap" keyword in ld.so.conf files
 
-* Tue Apr  4 2005 Jakub Jelinek <jakub@redhat.com> 2.3.4-21
+* Mon Apr  4 2005 Jakub Jelinek <jakub@redhat.com> 2.3.4-21
 - update from CVS
   - fix xdr_rmtcall_args on 64-bit arches (#151686)
 - fix <pthread.h> and <bits/libc-lock.h> with -std=c89 -fexceptions (#153774)
@@ -3337,7 +3433,7 @@ rm -f *.filelist*
 - use atomic instructions even in i386 nscd on i486+ CPUs
   (conditionally)
 
-* Sat Sep  3 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-49
+* Fri Sep  3 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-49
 - update from CVS
 - fix linuxthreads tst-cancel{[45],-static}
 
@@ -3542,7 +3638,7 @@ rm -f *.filelist*
   - fix pthread_getattr_np guardsize reporting in NPTL
 - report PLT relocations in ld.so and libc.so during the build
 
-* Fri Mar 25 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-20
+* Thu Mar 25 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-20
 - update from CVS
   - change NPTL PTHREAD_MUTEX_ADAPTIVE_NP mutexes to spin on SMP
   - strtol speed optimization
@@ -3825,7 +3921,7 @@ rm -f *.filelist*
   ld.so and NPTL (on IA-32 also FLOATING_STACKS linuxthreads) libraries
   and tests
 
-* Tue Aug 25 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-78
+* Mon Aug 25 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-78
 - include dl-osinfo.h only in glibc-debuginfo-2*.rpm, not
   in glibc-debuginfo-common*
 
@@ -3966,7 +4062,7 @@ rm -f *.filelist*
 - don't prelink -R libc.so on any architecture, it prohibits
   address randomization
 
-* Fri Jun  5 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-48
+* Thu Jun  5 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-48
 - update from CVS
   - fix IA-64 NPTL build
 
@@ -3980,10 +4076,10 @@ rm -f *.filelist*
 - enable NPTL on AMD64
 - avoid using trampolines in localedef
 
-* Fri May 29 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-45
+* Thu May 29 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-45
 - enable NPTL on IA-64
 
-* Fri May 29 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-44
+* Thu May 29 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-44
 - update from CVS
 - enable NPTL on s390 and s390x
 - make __init_array_start etc. symbols in elf-init.oS hidden undefined
@@ -4163,7 +4259,7 @@ rm -f *.filelist*
 - fix TLS IE/LE model handling in dlopened libraries
   on TCB_AT_TP arches
 
-* Thu Feb 25 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-5
+* Tue Feb 25 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-5
 - update from CVS
 
 * Tue Feb 25 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-4
@@ -4700,7 +4796,7 @@ rm -f *.filelist*
 - disable autoreq in glibc-debug
 - readd %%lang() to locale files
 
-* Fri Feb  7 2002 Jakub Jelinek <jakub@redhat.com> 2.2.90-4
+* Thu Feb  7 2002 Jakub Jelinek <jakub@redhat.com> 2.2.90-4
 - update to CVS
 - move glibc private symbols to GLIBC_PRIVATE symbol version
 

g/guile/guile-vl.spec

@@ -4,8 +4,8 @@
 Name: guile
 Summary: A GNU implementation of Scheme for application extensibility.
 Summary(ja): アプリケーション拡張用 Scheme の GNU な実装
-Version: 1.8.7
+Version: 1.8.8
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 
 Group: Development/Languages
 License: GPLv2+ and LGPLv2+ and GFDL and OFSFDL
@@ -16,10 +16,7 @@ Source: ftp://ftp.gnu.org/gnu/guile-%{version}.tar.gz
 # following patchs are imported from fedora-dev 
 Patch1: guile-1.8.7-multilib.patch
 Patch2: guile-1.8.7-testsuite.patch
-Patch3: guile-1.8.7-ia64jmp.patch
 Patch4: guile-1.8.6-deplibs.patch
-Patch5: guile-1.8.7-linemarkers.patch
-Patch6: guile-1.8.7-testsuite2.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtool libtool-ltdl-devel >= 2.2.6a
@@ -93,10 +90,7 @@ install the guile package.
 %setup -q
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .testsuite
-%patch3 -p1 -b .ia64jmp
 %patch4 -p1 -b .deplibs
-%patch5 -p1 -b .linemarkers
-%patch6 -p1 -b .testsuite2
 
 %build
 %configure --disable-static --disable-error-on-warning
@@ -204,6 +198,10 @@ fi
 %endif
 
 %changelog
+* Tue Nov 05 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.8.8-1
+- update to 1.8.8
+- remove Patch3,5,6 (guile-1.8.7-ia64jmp.patch)
+
 * Sat Oct 09 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.8.7-2
 - rebuilt with rpm-4.8.1
 - added Patch1, 2, 3, 5 and 6 from Fedora 

lib/libm/libmpc/libmpc-vl.spec

@@ -1,8 +1,8 @@
 Summary: C library for multiple precision complex arithmetic
 Name: libmpc
-Version: 0.9
+Version: 1.0.1
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
-License: LGPLv2+
+License: LGPLv3+
 Group: Development/Tools
 URL: http://www.multiprecision.org/
 Source0: mpc-%{version}.tar.gz
@@ -65,7 +65,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc README NEWS COPYING.LIB
+%doc README NEWS COPYING.LESSER
 %{_libdir}/libmpc.so.*
 
 %files devel
@@ -75,6 +75,9 @@ fi
 %{_infodir}/*.info*
 
 %changelog
+* Mon Nov 04 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.0.1-1
+- update to 1.0.1
+
 * Tue Nov 01 2011 NAKAMURA Kenta <kenta@vinelinux.org> - 0.9-2
 - initial build for Vine Linux
 

lib/libt/libtool/libtool-vl.spec

@@ -1,12 +1,12 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-%define gcc_version 4.8.1
+%define gcc_version 4.8.2
 
 Summary: The GNU Portable Library Tool
 Summary(ja): GNU ポータブルライブラリツール
 Name:    libtool
 Version: 2.4.2
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group:   Development/Tools
 URL:     http://www.gnu.org/software/libtool/
@@ -212,6 +212,9 @@ fi
 
 
 %changelog
+* Mon Nov 04 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.2-4
+- rebuild with gcc-4.8.2-1
+
 * Tue Oct 01 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.2-3
 - rebuild with gcc-4.8.1-2
 

m/mpfr/mpfr-vl.spec

@@ -1,17 +1,17 @@
 Summary: A C library for multiple-precision floating-point computations
 Name: mpfr
-Version: 3.1.0
+Version: 3.1.2
 Release: 1%{?_dist_release}
 URL: http://www.mpfr.org/
 Source0: http://www.mpfr.org/mpfr-current/mpfr-%{version}.tar.xz
-License: LGPLv2+ and GPLv2+ and GFDL
+License: LGPLv3+
 Group: System Environment/Libraries
 Vendor: Project Vine 
 Distribution: Vine Linux 
 Packager: inagaki, Takemikaduchi, kenta
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gmp-devel
-Requires: gmp >= 4.2.1
+Requires: gmp >= 4.2.3
 
 %description
 The MPFR library is a C library for multiple-precision floating-point
@@ -24,7 +24,7 @@ ANSI/IEEE-754 standard for double-precision floating-point arithmetic
 Summary: Development tools A C library for mpfr library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: gmp-devel >= 4.2.1
+Requires: gmp-devel >= 4.2.3
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/mpfr.info*
 
 %changelog
+* Mon Nov 04 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.2-1
+- update to 3.1.2
+
 * Sun Oct 30 2011 NAKAMURA Kenta <kenta@vinelinux.org> 3.1.0-1
 - new upstream release
 
@@ -116,6 +119,6 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Aug 20 2007 Ivana Varekova <varekova@redhat.com> 2.2.1-2
 - spec file cleanup (#253440)
 
-* Mon Jan 16 2007 Ivana Varekova <varekova@redhat.com> 2.2.1-1
+* Tue Jan 16 2007 Ivana Varekova <varekova@redhat.com> 2.2.1-1
 - started
 

w/wireshark/wireshark-vl.spec

@@ -3,7 +3,7 @@
 Summary: 	Network traffic analyzer
 Summary(ja):    ネットワークトラフィック解析プログラム
 Name: 		wireshark
-Version:	1.10.2
+Version:	1.10.3
 Release: 	1%{_dist_release}
 License: 	GPLv2
 Group: 		Applications/System
@@ -216,6 +216,10 @@ update-desktop-database -q
 
 
 %changelog
+* Tue Nov 05 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.10.3-1
+- new upstream release
+  (including security fix for CVE-2013-6336,6337,6338,6339,6340)
+
 * Mon Sep 16 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.10.2-1
 - new upstream release
 

x/xorg-x11-drv-ast/xorg-x11-drv-ast-vl.spec

@@ -5,8 +5,8 @@
 Summary:   Xorg X11 ast video driver
 Summary(ja):   Xorg X11 ast ビデオドライバ
 Name:      xorg-x11-drv-ast
-Version:   0.97.0
+Version:   0.98.0
-Release:   2%{?_dist_release}
+Release:   1%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -15,8 +15,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   ast.xinf
 
-Patch0:    xf86-video-ast-0.97.0-disable-mibstore.patch
-
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.6
@@ -29,7 +27,6 @@ X.Org X11 ast video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .mibstore
 
 %build
 %configure --disable-static --disable-dri --enable-xaa=no
@@ -56,6 +53,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/hwdata/videoaliases/ast.xinf
 
 %changelog
+* Sun Nov 03 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.98.0-1
+- new upstream release
+- remove Patch0 (xf86-video-ast-0.97.0-disable-mibstore.patch)
+
 * Sun May 05 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.97.0-2
 - rebuild with xserver-1.14.1
 - add Patch0 (xf86-video-ast-0.97.0-disable-mibstore.patch)

x/xorg-x11-drv-ati/xorg-x11-drv-ati-vl.spec

@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Summary(ja):   Xorg X11 ati ビデオドライバ
 Name:      xorg-x11-drv-ati
-Version:   7.1.0
+Version:   7.2.0
 Release:   1%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT
@@ -13,8 +13,6 @@ Group:     User Interface/X Hardware Support
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
-Patch0:		xf86-video-ati-7.1.0-git20130426.patch
-
 Patch11:    radeon-6.12.2-lvds-default-modes.patch
 Patch12:    fix-default-modes.patch
 
@@ -38,7 +36,6 @@ X.Org X11 ati video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1
 %patch11 -p1 -b .lvds
 %patch12 -p1 -b .def
 
@@ -69,6 +66,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Sun Nov 03 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 7.2.0-1
+- new upstream release
+- remove Patch0 (xf86-video-ati-7.1.0-git20130426.patch)
+
 * Sun May 05 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 7.1.0-1
 - new upstream release
 - remove Source1 (mkxinf.ati)

x/xorg-x11-drv-dummy/xorg-x11-drv-dummy-vl.spec

@@ -5,8 +5,8 @@
 Summary:   Xorg X11 dummy video driver
 Summary(ja):   Xorg X11 dummy ビデオドライバ
 Name:      xorg-x11-drv-dummy
-Version:   0.3.6
+Version:   0.3.7
-Release:   2%{?_dist_release}
+Release:   1%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,8 +14,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
-Patch0:		xf86-video-dummy-0.3.6-remove-mibstore.patch
-
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk
@@ -28,7 +26,6 @@ X.Org X11 dummy video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .mibstore
 
 %build
 %configure --disable-static
@@ -51,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT
 %{driverdir}/dummy_drv.so
 
 %changelog
+* Sun Nov 03 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.3.7-1
+- new upstream release
+- remove Patch0 (xf86-video-dummy-0.3.6-remove-mibstore.patch)
+
 * Sun May 05 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.3.6-2
 - rebuild with xserver-1.14.1
 - add Patch0 (xf86-video-dummy-0.3.6-remove-mibstore.patch)

x/xorg-x11-drv-evdev/xorg-x11-drv-evdev-vl.spec

@@ -5,7 +5,7 @@
 Summary:   Xorg X11 evdev input driver
 Summary(ja):   Xorg X11 evdev 入力ドライバ
 Name:      xorg-x11-drv-evdev
-Version:   2.8.0
+Version:   2.8.2
 Release:   1%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xorg-evdev.pc
 
 %changelog
+* Sun Nov 03 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.8.2-1
+- new upstream release
+
 * Sun May 05 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.8.0-1
 - new upstream release
 

x/xorg-x11-drv-fbdev/xorg-x11-drv-fbdev-vl.spec

@@ -5,8 +5,8 @@
 Summary:   Xorg X11 fbdev video driver
 Summary(ja):   Xorg X11 fbdev ビデオドライバ
 Name:      xorg-x11-drv-fbdev
-Version:   0.4.3
+Version:   0.4.4
-Release:   2%{?_dist_release}
+Release:   1%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,12 +14,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
-Patch0:		xf86-video-fbdev-0.4.3-remove-mibstore.patch
-
 ExcludeArch: s390 s390x
 
-Patch1: fbdev-0.3.0-32fbbpp.patch
-
 BuildRequires: xorg-x11-server-sdk
 BuildRequires: autoconf automake libtool
 
@@ -30,7 +26,6 @@ X.Org X11 fbdev video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .mibstore
 
 %build
 %configure --disable-static
@@ -54,6 +49,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/fbdev.4*
 
 %changelog
+* Sun Nov 03 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4.4-1
+- new upstream release
+- remove Patch0 (xf86-video-fbdev-0.4.3-remove-mibstore.patch)
+
 * Sun May 05 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4.3-2
 - rebuild with xserver-1.14.1
 - add Patch0 (xf86-video-fbdev-0.4.3-remove-mibstore.patch)

x/xorg-x11-drv-geode/xorg-x11-drv-geode-vl.spec

@@ -5,7 +5,7 @@
 Summary:   Xorg X11 AMD Geode video driver
 Summary(ja):   Xorg X11 AMD Geode ビデオドライバ
 Name:      xorg-x11-drv-geode
-Version:   2.11.14
+Version:   2.11.15
 Release:   1%{?_dist_release}
 URL:       http://www.x.org/wiki/AMDGeodeDriver
 License:   MIT
@@ -13,8 +13,6 @@ Group:     User Interface/X Hardware Support
 
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-%{version}.tar.bz2
 
-Patch0:		xf86-video-geode-2.11.14-remove-mibstore.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Provides:  xorg-x11-drv-amd = %{version}-%{release}
 Obsoletes: XOrg-drv-amd <= 2.7.7.7
@@ -37,7 +35,6 @@ X.Org X11 AMD Geode video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .mibstore
 #./autogen.sh
 
 %build
@@ -68,6 +65,10 @@ rm -rf $RPM_BUILD_ROOT
 %{driverdir}/ztv_drv.so
 
 %changelog
+* Sun Nov 03 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.11.15-1
+- new upstream release
+- remove Patch0 (xf86-video-geode-2.11.14-remove-mibstore.patch)
+
 * Sun May 05 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.11.14-1
 - new upstream release
 - add Patch0 (xf86-video-geode-2.11.14-remove-mibstore.patch)

x/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard-vl.spec

@@ -5,7 +5,7 @@
 Summary:   Xorg X11 keyboard input driver
 Summary(ja):   Xorg X11 キーボード入力ドライバ
 Name:      xorg-x11-drv-keyboard
-Version:   1.7.0
+Version:   1.8.0
 Release:   1%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT
@@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 #{_mandir}/man4/keyboard.4*
 
 %changelog
+* Sun Nov 03 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.8.0-1
+- new upstream release
+
 * Sun May 05 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.7.0-1
 - new upstream release
 

x/xorg-x11-drv-neomagic/xorg-x11-drv-neomagic-vl.spec

@@ -5,8 +5,8 @@
 Summary:   Xorg X11 neomagic video driver
 Summary(ja):   Xorg X11 neomagic ビデオドライバ
 Name:      xorg-x11-drv-neomagic
-Version:   1.2.7
+Version:   1.2.8
-Release:   2%{?_dist_release}
+Release:   1%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -15,8 +15,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   neomagic.xinf
 
-Patch0:		xf86-video-neomagic-1.2.7-remove-mibstore.patch
-
 ## ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
@@ -29,7 +27,6 @@ X.Org X11 neomagic video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .mibstore
 
 %build
 %configure --disable-static --enable-xaa=no
@@ -57,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/neomagic.4*
 
 %changelog
+* Sun Nov 03 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.8-1
+- new upstream release
+- remove Patch0 (xf86-video-neomagic-1.2.7-remove-mibstore.patch)
+
 * Sun May 05 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.7-2
 - rebuild with xserver-1.14.1
 - add Patch0 (xf86-video-neomagic-1.2.7-remove-mibstore.patch)

x/xorg-x11-drv-nouveau/xorg-x11-drv-nouveau-vl.spec

@@ -5,7 +5,7 @@
 Summary:   Xorg X11 nouveau video driver for NVIDIA graphics chipsets
 Summary(ja): Xorg X11 nouveau ビデオドライバ - NVIDIA グラフィックスチップセット用
 Name:      xorg-x11-drv-nouveau
-Version:   1.0.7
+Version:   1.0.9
 Release:   1%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Sun Nov 03 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.9-1
+- new upstream release
+
 * Sun May 05 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.7-1
 - new upstream release
 

x/xorg-x11-drv-r128/xorg-x11-drv-r128-vl.spec

@@ -5,8 +5,8 @@
 Summary:   Xorg X11 r128 video driver
 Summary(ja):   Xorg X11 r128 ビデオドライバ
 Name:      xorg-x11-drv-r128
-Version:   6.9.1
+Version:   6.9.2
-Release:   2%{?_dist_release}
+Release:   1%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 03 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 6.9.2-1
+- new upstream release
+
 * Sun May 05 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 6.9.1-2
 - rebuild with xserver-1.14.1
 

x/xorg-x11-drv-savage/xorg-x11-drv-savage-vl.spec

@@ -5,8 +5,8 @@
 Summary:   Xorg X11 savage video driver
 Summary(ja):   Xorg X11 savage ビデオドライバ
 Name:      xorg-x11-drv-savage
-Version:   2.3.6
+Version:   2.3.7
-Release:   2%{?_dist_release}
+Release:   1%{?_dist_release}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/savage.4*
 
 %changelog
+* Sun Nov 03 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.3.7-1
+- new upstream release
+
 * Sun May 05 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.3.6-2
 - rebuild with xserver-1.14.1
 

x/xorg-x11-drv-vesa/xorg-x11-drv-vesa-vl.spec

@@ -5,16 +5,14 @@
 Summary:   Xorg X11 vesa video driver
 Summary(ja):   Xorg X11 vesa ビデオドライバ
 Name:      xorg-x11-drv-vesa
-Version:   2.3.2
+Version:   2.3.3
-Release:   2%{?_dist_release}
+Release:   1%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 
-Patch0:		xf86-video-vesa-2.3.2-git20130116.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: xorg-x11-server-sdk >= 1.4.99
 Requires:  xorg-x11-server-Xorg
@@ -24,7 +22,6 @@ X.Org X11 vesa video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1
 
 %build
 %configure --disable-static --enable-xaa=no
@@ -48,6 +45,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/vesa.4*
 
 %changelog
+* Sun Nov 03 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.3.3-1
+- new upstream release
+- remove Patch0 (xf86-video-vesa-2.3.2-git20130116.patch)
+
 * Sun May 05 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.3.2-2
 - add Patch0 (xf86-video-vesa-2.3.2-git20130116.patch)
 

x/xorg-x11-server/xorg-x11-server-vl.spec

@@ -5,7 +5,7 @@
 Summary:   X.Org X11 X server
 Summary(ja):   X.Org X11 X サーバ
 Name:      xorg-x11-server
-Version:   1.14.3
+Version:   1.14.4
 Release:   1%{?_dist_release}
 URL:       http://www.x.org
 License:   MIT/X11
@@ -534,6 +534,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 03 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.14.4-1
+- new upstream release
+
 * Mon Sep 23 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.14.3-1
 - new upstream release