2014-10-01 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* arts, kdelibs3: rebuilt
	* global, source-highlight: updated
	


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

a/arts/arts-vl.spec

@@ -1,18 +1,18 @@
 %define run_test 0
-%define make_cvs 1
 
 Name: arts
 Summary: aRts (analog realtime synthesizer) - the KDE 3 sound system
 Summary(ja): aRts - KDE 3 サウンドシステム
 Epoch: 1
 Version: 1.5.10
-Release: 6%{?_dist_release}
+Release: 7%{?_dist_release}
 
 Group: System Environment/Daemons
-License: LGPLv2
+License: LGPLv2+
 URL: http://www.kde.org
 
 Source: ftp://ftp.kde.org/pub/kde/stable/3.5.10/src/%{name}-%{version}.tar.bz2
+Source1: gslconfig-wrapper.h
 
 Patch1: arts-1.1.4-debug.patch
 Patch2: arts-1.3.92-glib2.patch
@@ -33,22 +33,30 @@ Patch200: libltdl-CVE-2009-3736.patch
 
 # tweak autoconfigury so that it builds with autoconf 2.64 or 2.65
 Patch300: arts-acinclude.patch
+# remove flawed and obsolete automake version check in admin/cvs.sh
+Patch301: kde3-automake-version.patch
+# fix build failure with automake 1.13: add the --add-missing --copy flags
+# also add --force-missing to get aarch64 support (#925029/#925627)
+Patch302: kde3-automake-add-missing.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gcc-c++
-BuildRequires: qt-devel >= 3.3.8
 BuildRequires: alsa-lib-devel
 BuildRequires: audiofile-devel
-%if %{make_cvs}
 BuildRequires: automake libtool
-%endif
+BuildRequires: chrpath
-BuildRequires: libogg-devel libvorbis-devel glib2-devel
+BuildRequires: esound-devel
-BuildRequires: esound-devel jack-audio-connection-kit-devel 
+BuildRequires: glib2-devel
+BuildRequires: libvorbis-devel
 BuildRequires: pkgconfig
+BuildRequires: qt-devel >= 3.3.8
+
 %if %{run_test}
 BuildRequires: kdelibs3
 %endif
 
+# used in artsdsp
+Requires: which
+
 Obsoletes: kdelibs-sound
 Provides: kdelibs-sound
 
@@ -69,9 +77,9 @@ Summary: Development files for the aRts sound server
 Summary(ja): aRts サウンドサーバの開発用ファイル
 Group: Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: qt-devel
 Requires: glib2-devel
 Requires: pkgconfig
+Requires: qt-devel
 Obsoletes: kdelibs-sound-devel
 Provides: kdelibs-sound-devel
 
@@ -106,14 +114,11 @@ KDE applications using sound).
 %patch200 -p1 -b .CVE-2009-3736
 
 %patch300 -p1 -b .acinclude
+%patch301 -p1 -b .automake-version
+%patch302 -p1 -b .automake-add-missing
+make -f admin/Makefile.common cvs
 
 %build
-%if %{make_cvs}
-# hack/fix for newer automake
-  sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
-  make -f admin/Makefile.common cvs
-%endif
-
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 %configure \
@@ -127,6 +132,13 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh
     --with-alsa \
     --enable-final
 
+# kill rpath harder, inspired by https://fedoraproject.org/wiki/Packaging:Guidelines?rd=Packaging/Guidelines#Removing_Rpath
+# other more standard variants didnt work or caused other problems
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' libtool
+
+## hack for artsdsp (see http://bugzilla.redhat.com/329671)
+#make %{?_smp_mflags} -k || \
+#  sed -i -e "s|-Wp,-D_FORTIFY_SOURCE=2||" artsc/Makefile && \
 make %{?_smp_mflags}
 
 %if %{run_test}
@@ -138,7 +150,12 @@ rm -rf $RPM_BUILD_ROOT
 export PATH=`pwd`:$PATH
 make DESTDIR=$RPM_BUILD_ROOT install
 
-## remove references to optional external libraries in .la files (#178733)
+# Ugly hack to allow parallel installation of 32-bit and 64-bit arts-devel
+mv  $RPM_BUILD_ROOT%{_includedir}/kde/arts/gsl/gslconfig.h \
+    $RPM_BUILD_ROOT%{_includedir}/kde/arts/gsl/gslconfig-%{_arch}.h
+install -p -m644 %{SOURCE1}  $RPM_BUILD_ROOT%{_includedir}/kde/arts/gsl/gslconfig.h
+
+  ## remove references to optional external libraries in .la files (#178733)
 find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
  sed -i \
  -e "s|-lmad||g" \
@@ -165,6 +182,10 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
 
 #chmod a+x $RPM_BUILD_ROOT%{_libdir}/*
 
+%check
+## Verify rpath, or lack thereof
+test -z "$(chrpath --list %{buildroot}%{_bindir}/artsd 2>/dev/null | grep RPATH=%{_libdir})"
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -195,6 +216,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/artsc.pc
 
 %changelog
+* Sun Sep 28 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.5.10-7
+- added Patch301 and 302 from FC
+
 * Mon May 07 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.5.10-6
 - rebuild with audiofile-0.3.4
 

g/global/global-vl.spec

@@ -1,9 +1,9 @@
 #%define priority 30
 
+Name: global
 Summary: GNU GLOBAL is a source code tag system
 Summary(ja): GNU GLOBAL ソースコードタグシステム
-Name: global
+Version: 6.3.2
-Version: 6.2.2
 Release: 1%{?_dist_release}
 
 License: GPLv3
@@ -32,8 +32,8 @@ C, C++, Yacc, Java, PHP4 のソースコードをサポートします．
 %setup -q
 
 %build
-%configure --disable-static
+%configure --enable-silent-rules --disable-static
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -70,6 +70,9 @@ fi
 %{_infodir}/global.info*
 
 %changelog
+* Wed Oct  1 2014 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 6.3.2-1
+- new upstream release
+
 * Tue May 15 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 6.2.2-1
 - new upstream release
 - added BR: ncurses-devel

k/kdelibs3/kdelibs3-vl.spec

@@ -2,13 +2,13 @@
 %define qt3_docdir %{_docdir}/qt-devel-%{qt3_version}
 
 %define kde_major_version 3
-%define apidocs 1
+%define apidocs 0
 
 Summary: KDE 3 Libraries
 Summary(ja): KDE 3 ライブラリ
 Name: kdelibs3
 Version: 3.5.10
-Release: 6%{?_dist_release}
+Release: 7%{?_dist_release}
 
 License: LGPLv2
 URL: http://www.kde.org/
@@ -45,10 +45,14 @@ Patch51: kdelibs-3.5.9-cupsserverbin.patch
 Patch52: kdelibs-3.5.9-KDE3.patch
 # use /usr/libexec/kde4/drkonqi in KCrash (#453243)
 Patch53: kdelibs-3.5.9-drkonqi-kde4.patch
-# fix build against Rawhide kernel headers (fix flock and flock64 redefinition)
+# use inotify_* functions which are defined in glibc-header
-Patch54: kdelibs-3.5.9-fix-flock-redefinition.patch
+Patch54: kdelibs-3.5.10-inotify.patch
 # update the KatePart latex.xml syntax definition to the version from Kile 2.0.3
 Patch55: kdelibs-3.5.10-latex-syntax-kile-2.0.3.patch
+# fix ftbfs (#631195)
+Patch56: kdelibs-3.5.10-qcolor_gcc_ftbfs.patch
+# fix FTBFS (cups-util.c must include stdio.h, #714133)
+Patch57: kdelibs-3.5.10-cups-util-missing-header.patch
 
 # Other patches
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
@@ -72,6 +76,12 @@ Patch120: kzip.cpp.diff
 # RH patches (do we need this patch in KDE3 environment like Vine Linux 4.x?)
 Patch121: kdelibs-3.4.0-menu.patch
 
+## Trinity backports
+# build fix for CUPS 1.6 by Timothy Pearson, backported by Kevin Kofler
+# http://git.trinitydesktop.org/cgit/tdelibs/commit?id=9bc0d2cd9d38750658770e69bf0445dc5162beb7
+# http://git.trinitydesktop.org/cgit/tdelibs/commit?id=91bf63b43bf4cc9ff640bd3c11549644cef05e6e
+Patch150: kdelibs-3.5.10-cups16.patch
+
 ## security fixes
 # fix CVE-2009-2537 - select length DoS
 Patch200: kdelibs-3.5.10-cve-2009-2537-select-length.patch
@@ -89,9 +99,23 @@ Patch205: kdelibs-3.5.10-CVE-2009-2702.patch
 Patch206: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch
 # CVE-2009-3736, libltdl may load and execute code from a library in the current directory
 Patch207: libltdl-CVE-2009-3736.patch
+# CVE-2011-3365, input validation failure in KSSL
+Patch208: kdelibs-3.5.x-CVE-2011-3365.patch
+# CVE-2013-2074, prints passwords contained in HTTP URLs in error messages
+Patch209: kdelibs-3.5.10-CVE-2013-2074.patch
 # fix CVE-2006-4811 (former Patch2)
 Patch220: kdelibs-3.5.5-khtml-overflow-CVE-2006-4811.patch
 
+## fixes to common KDE 3 autotools machinery
+# tweak autoconfigury so that it builds with autoconf 2.64 or 2.65
+Patch300: kde3-acinclude.patch
+# remove flawed and obsolete automake version check in admin/cvs.sh
+Patch301: kde3-automake-version.patch
+# fix build failure with automake 1.13: add the --add-missing --copy flags
+# also add --force-missing to get aarch64 support (#925029/#925627)
+Patch302: kde3-automake-add-missing.patch
+
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: cups-devel >= 1.1.12
 BuildRequires: qt-devel >= 3.3.2
@@ -109,7 +133,6 @@ BuildRequires: aspell-devel libidn-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: avahi-devel
-BuildRequires: gamin-devel
 BuildRequires: enchant-devel
 %if %{?_dist_release} != "vl4"
 BuildRequires: libICE-devel libSM-devel
@@ -130,7 +153,7 @@ Requires: alsa-lib
 Requires: vine-menus
 Requires: nss-mdns
 Requires: hicolor-icon-theme
-Requires: kde-settings
+#Requires: kde-settings
 Requires: kdelibs-common
 
 Provides: crystalsvg-icon-theme = %{version}-%{release}
@@ -212,8 +235,10 @@ format for easy browsing
 %patch51 -p1 -b .cupsserverbin
 %patch52 -p1 -b .KDE3
 %patch53 -p1 -b .drkonqi-kde4
-%patch54 -p1 -b .flock-redefinition
+%patch54 -p1 -b .inotify
 %patch55 -p1 -b .latex-syntax
+%patch56 -p1 -b .qcolor_gcc_ftbfs
+%patch57 -p1 -b .cups-util
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
@@ -223,13 +248,15 @@ format for easy browsing
 %patch107 -p1 -b .assert
 %patch108 -p1 -b .alias
 %patch109 -p1 -b .kabc
-%patch110 -p1 -b .autoconf
+#patch110 -p1 -b .autoconf
 %patch111 -p1 -b .kde-config_kde-version
 pushd kio/kio
 %patch120 -p0
 popd
 #patch121 -p1
 
+%patch150 -p1 -b .cups16
+
 # security fixes
 %patch200 -p1 -b .cve-2009-2537
 %patch201 -p0 -b .cve-2009-1725
@@ -239,16 +266,15 @@ popd
 %patch205 -p1 -b .cve-2009-2702
 %patch206 -p0 -b .oCERT-2009-015-xmlhttprequest
 %patch207 -p1 -b .CVE-2009-3736
+%patch208 -p1 -b .CVE-2011-3365
+%patch209 -p1 -b .CVE-2013-2074
 %patch220 -p1 -b .CVE-2006-4811
 
-# Make the version number say what it should say
+%patch300 -p1 -b .acinclude
-perl -pi -e 's,#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING "%{version}-%{release}",g' kdecore/kdeversion.h
+%patch301 -p1 -b .automake-version
-
+%patch302 -p1 -b .automake-add-missing
-# hack/fix for newer automake
-sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
 make -f admin/Makefile.common cvs
 
-
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
@@ -267,17 +293,20 @@ export DO_NOT_COMPILE="libkscreensaver"
     --disable-rpath \
     --enable-new-ldflags \
     --disable-dependency-tracking \
-    --disable-debug --disable-warning --enable-final \
+    --disable-debug --disable-warnings --enable-final \
     --disable-fast-malloc \
 %if "%{_lib}" == "lib64"
     --enable-libsuffix="64" \
 %endif
     --with-qt-libraries=$QTDIR/lib \
     --with-extra-includes=%{_includedir}/avahi-compat-libdns_sd \
-    --enable-pie \
+    --enable-cups \
     --enable-mitshm \
+    --enable-pie \
+    --enable-sendfile \
     --enable-dnotify \
     --enable-inotify \
+    --disable-libfam \
     --with-acl \
     --with-alsa \
     --with-utempter \
@@ -286,9 +315,13 @@ export DO_NOT_COMPILE="libkscreensaver"
     --with-libart \
     --with-jasper \
     --with-openexr \
-    --with-aspell \
+    --without-aspell \
     --without-hspell \
-    --with-distribution=VineLinux
+    --with-distribution="$(cat /etc/vine-release 2>/dev/null)"
+
+# kill rpath harder, inspired by https://fedoraproject.org/wiki/Packaging:Guidelines?rd=Packaging/Guidelines#Removing_Rpath
+# other more standard variants didnt work or caused other problems
+sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' libtool
 
 %if %{apidocs}
 # make KDE API documentation
@@ -542,6 +575,13 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 %endif
 
 %changelog
+* Tue Sep 30 2014 Ryoichi INAGAKI <ryo1@toki.wakwak.jp> 3.5.10-7
+- rebuilt on current VineSeed
+- added Patch 56, 57, 150, 208, 209, 300, 301 and 302 from FC
+- updated Patch54 from FC
+- dropt apidocs subpackage
+- removed kde-settings dependency
+
 * Thu Mar 24 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.5.10-6
 - rebuilt with openssl-1.0.0d, krb5-libs-1.8.2 and cups-1.4.6
 - added R: kdelibs-common

s/source-highlight/source-highlight-vl.spec

@@ -4,16 +4,16 @@
 # Author: Christian W. Zuckschwerdt <zany@triq.net>, Jan 2003
 #
 
-Summary:   syntax highlighting for source documents
 Name:      source-highlight
-Version:   3.1.4
+Summary:   Syntax highlighting for source documents
-Release:   3%{?_dist_release}
+Version:   3.1.7
-License:   GPL
+Release:   1%{?_dist_release}
-Group:     Utilities/Console
+License:   GPLv3
+Group:     Development/Tools
 Source:    ftp://ftp.gnu.org/gnu/source-highlight/%{name}-%{version}.tar.gz
 URL:       http://www.gnu.org/software/src-highlite/
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libboost-devel >= 1.33.1
 BuildRequires: libboost-regex >= 1.33.1
 BuildRequires: bison
@@ -51,7 +51,7 @@ source-highlight
 
 %build
 %configure --disable-static --with-boost-regex=boost_regex
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -77,7 +77,7 @@ fi
 %files
 %defattr(-, root, root)
 %doc README COPYING ChangeLog TODO.txt AUTHORS THANKS
-%{_sysconfdir}/bash_completion.d/source-highlight-bash-completion
+%{_sysconfdir}/bash_completion.d/source-highlight
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_datadir}/%{name}/*
@@ -90,10 +90,14 @@ fi
 %{_includedir}/srchilite/*.h
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/source-highlight.pc
-%{_datadir}/aclocal/*.m4
+#{_datadir}/aclocal/*.m4
 
 
 %changelog
+* Wed Oct  1 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.1.7-1
+- updated to 3.1.7
+- changed Group to Development/Tools
+
 * Mon Dec 09 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-3
 - rebuild with libboost-1.54.0