Browse Source

2014-12-19 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* ImageMagick, gegl, kdebase-runtime, kdelibs: rebuilt
	* OpenEXR, ilmbase: updated
	* freeimage, kdelibs3: added patch
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9166 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
e284dd8900

+ 9 - 4
I/ImageMagick/ImageMagick-vl.spec

@@ -1,8 +1,8 @@
 # ImageMagick has adopted a new Version.Patchlevel version numbering system...
 # 6.2.9.7 is actually version 6.2.9, Patchlevel 0.
 
-%define VER 6.8.9
-%define Patchlevel 7
+%define VER 6.9.0
+%define Patchlevel 0
 
 Name: ImageMagick
 Summary: X application for displaying and manipulating images.
@@ -17,13 +17,14 @@ Release: 1%{?_dist_release}
 
 License: freeware
 Group: Applications/Graphics
+URL: http://www.imagemagick.org/
+
 %if "%{Patchlevel}" != ""
 Source: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.xz
 %else
 Source: ftp://ftp.ImageMagick.org/ImageMagick/ImageMagick-%{version}.tar.xz
 %endif
 #Patch1: ImageMagick-6.2.9-CVE-2006-5456_2007-0770.patch
-URL: http://www.imagemagick.org/
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: bzip2-devel
@@ -180,7 +181,7 @@ Summary: ImageMagick perl bindings
 Summary(ja): ImageMagick の Perl バインディング
 Group: Development/Libraries
 Requires: ImageMagick = %{version}-%{release}
-Requires: perl >= 5.8.0
+Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Obsoletes: ImageMagick-perl < %{version}-%{release}
 Provides: ImageMagick-perl = %{version}-%{release}
 
@@ -331,6 +332,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Thu Dec 18 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 6.9.0.0-1
+- new upstream release
+- built with OpenEXR 2.2.0
+
 * Sun Aug 24 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 6.8.9.7-1
 - new upstream release
 

+ 19 - 20
O/OpenEXR/OpenEXR-vl.spec

@@ -1,12 +1,11 @@
-
 Name:	 OpenEXR
 Summary: A high dynamic-range (HDR) image file format
 Summary(ja): 高ダイナミックレンジ(HDR)画像ファイルフォーマット
-Version: 2.1.0
+Version: 2.2.0
 Release: 1%{?_dist_release}
 
-Group:	 System Environment/Libraries
 License: BSD
+Group:	 Applications/Graphics
 URL:	 http://www.openexr.com/
 
 Source0: http://download.savannah.nongnu.org/releases/openexr/openexr-%{version}.tar.gz
@@ -16,9 +15,12 @@ Patch100: openexr-2.1.0-CVE-2009-1720-1.patch
 Patch101: openexr-2.1.0-CVE-2009-1720-2.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: automake libtool
-BuildRequires: ilmbase-devel
+BuildRequires: ilmbase-devel >= %{version}
 BuildRequires: zlib-devel
+BuildRequires: pkgconfig
+# https://github.com/openexr/openexr/issues/130
+BuildConflicts: OpenEXR-devel < 2.2.0
+
 Requires: %{name}-libs = %{version}-%{release}
 
 Obsoletes: openexr < %{version}-%{release}
@@ -27,11 +29,11 @@ Provides:  openexr = %{version}-%{release}
 %description
 OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial
 Light & Magic for use in computer imaging applications. This package contains
-libraries and sample applications for handling the format.
+sample applications for handling the format.
 
 %package libs
 Summary: %{name} runtime libraries
-Summary(ja): %{name} runtime libraries
+Summary(ja): %{name} のランタイムライブラリ
 Group:   System Environment/Libraries
 
 %description libs
@@ -39,8 +41,8 @@ Group:   System Environment/Libraries
 
 %package devel
 Summary: Development files for %{name} 
-Summary(ja): %{name} の開発ファイル
-Group:	 Development/Libraries
+Summary(ja): %{name} の開発ファイル
+Group:	  Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
 Requires: ilmbase-devel
 Obsoletes: openexr-devel < %{version}-%{release}
@@ -52,16 +54,6 @@ Provides:  openexr-devel = %{version}-%{release}
 %prep
 %setup -q -n openexr-%{version}
 
-%patch100 -p1 -b .CVE-2009-1720-1
-%patch101 -p1 -b .CVE-2009-1720-2
-
-# work to remove rpaths, recheck on new releases
-aclocal -Im4
-libtoolize --force
-rm -f configure
-autoconf
-
-
 %build
 %configure --disable-static
 
@@ -88,7 +80,9 @@ rm -rf rpmdocs/examples/.deps
 
 %check
 # Not enabled, by default, takes a *very* long time. -- Rex
-%{?_with_check:make check}
+%{?_with_check:export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig}
+%{?_with_check:test "$(pkg-config --modversion OpenEXR)" = "%{version}"}
+%{?_with_check:make check ||:}
 
 
 %clean
@@ -118,6 +112,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Dec 18 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.2.0-1
+- new upstream release
+- removed Patch100 and 101
+- built with ilmbase 2.2.0
+
 * Mon Dec 30 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.1.0-1
 - new upstream release
 - remove Patch1,2,102

+ 18 - 5
f/freeimage/freeimage-vl.spec

@@ -5,7 +5,7 @@ Summary:        Multi-format image decoder library
 Summary(ja):    マルチフォーマット画像デコードライブラリ
 Name:           freeimage
 Version:        3.10.0
-Release: 2%{?_dist_release}
+Release:        3%{?_dist_release}
 
 Group:          System Environment/Libraries
 # freeimage is dual-licensed, see Whatsnew.txt (search for license) or:
@@ -16,10 +16,17 @@ URL:            http://freeimage.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/FreeImage%{_version}.zip
 Patch0:         FreeImage-3.10.0-syslibs.patch
 Patch1:         FreeImage-3.10.0-doxygen.patch
+Patch2:         FreeImage-3.10.0-libpng15.patch
+Patch3:         FreeImage-3.10.0-libtiff4.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: libjpeg-devel libpng-devel libtiff-devel OpenEXR-devel
-BuildRequires: libmng-devel openjpeg-devel doxygen
+BuildRequires: libjpeg-devel
+BuildRequires: libmng-devel
+BuildRequires: libpng-devel
+BuildRequires: libtiff-devel
+BuildRequires: OpenEXR-devel
+BuildRequires: openjpeg-devel
+BuildRequires: doxygen
 
 %description
 FreeImage is a library for developers who would like to support popular
@@ -29,7 +36,7 @@ today's multimedia applications.
 
 %package        devel
 Summary:        Development files for %{name}
-Summary(ja):        Development files for %{name}
+Summary(ja):    %{name} の開発用ファイル
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
@@ -42,6 +49,8 @@ developing applications that use %{name}.
 %setup -q -n FreeImage
 %patch0 -p1 -z .syslibs
 %patch1 -p1
+%patch2 -p0
+%patch3 -p1
 touch -r Source/FreeImage.h.syslibs Source/FreeImage.h
 
 # remove all included libs to make sure these don't get used during compile
@@ -58,7 +67,7 @@ sed -i 's/\r//g' Whatsnew.txt license-*.txt gensrclist.sh \
 %build
 sh ./gensrclist.sh
 make %{?_smp_mflags} \
-  COMPILERFLAGS="$RPM_OPT_FLAGS -fPIC -fvisibility=hidden `pkg-config --cflags OpenEXR`"
+  COMPILERFLAGS="$RPM_OPT_FLAGS -fPIC -fvisibility=hidden `pkg-config --cflags OpenEXR` `pkg-config --cflags libopenjpeg`"
 
 # build libfreeimageplus DIY, as the provided makefile makes libfreeimageplus
 # contain a private copy of libfreeimage <sigh>
@@ -119,6 +128,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 14 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 3.10.0-2
+- rebuilt with libmng 2.0.2, libpng 1.6.12, libtiff 4.0.3, OpenEXR 2.2.0 and openjpeg 1.5.2
+- added Patch2 and Patch3
+
 * Thu Apr 14 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 3.10.0-2
 - rebuilt with openjpeg-1.4
 

+ 4 - 1
g/gegl/gegl-vl.spec

@@ -4,7 +4,7 @@ Summary:	A graph based image processing framework
 Summary(ja):	グラフベースの画像処理フレームワーク
 Name:		gegl
 Version:	0.2.0
-Release:	3%{?_dist_release}
+Release:	4%{?_dist_release}
 # The binary is under the GPL, while the libs are under LGPL
 License:	LGPLv3+ and GPLv3+
 Group:		System Environment/Libraries
@@ -109,6 +109,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/%{name}-%{VER}.pc
 
 %changelog
+* Thu Dec 18 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.2.0-4
+- rebuilt with OpenEXR 2.2.0
+
 * Sun Jul 13 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.2.0-3
 - rebuild with libpng-1.6.12
 

+ 23 - 7
i/ilmbase/ilmbase-vl.spec

@@ -1,7 +1,6 @@
 Summary: Abraction/convenience libraries 
-
 Name:	 ilmbase 
-Version: 2.1.0
+Version: 2.2.0
 Release: 1%{?_dist_release}
 
 Group:	 System Environment/Libraries
@@ -9,9 +8,18 @@ License: BSD
 URL:	 http://www.openexr.com/
 
 Source0: http://download.savannah.nongnu.org/releases/openexr/ilmbase-%{version}.tar.gz
+## upstreamable patches
+# explicitly add $(PTHREAD_LIBS) to libIlmThread linkage (helps PTHREAD_LIBS workaround in %%build)
+Patch51: ilmbase-2.2.0-no_undefined.patch
+# add Requires.private: gl glu to IlmBase.pc
+Patch53:  ilmbase-1.0.3-pkgconfig.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: pkgconfig
+# silly rpm, won't pick up rpm dependencies for items not in it's buildroot
+# see http://bugzilla.redhat.com/866302
+BuildRequires: libGL-devel
+BuildRequires: libGLU-devel
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -29,33 +37,37 @@ Iex is an exception-handling library.
 
 %package devel
 Summary: Headers and libraries for building apps that use %{name} 
-Group:	 Development/Libraries
+Summary(ja): %{name} を使うアプリケーションをビルドするためのヘッダファイル及びライブラリ
+Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libGL-devel libGLU-devel
 Requires: pkgconfig
+
 %description devel
 %{summary}.
 
 
 %prep
 %setup -q
+%patch51 -p1 -b .no_undefined
+%patch53 -p1 -b .pkgconfig
 
 %build
 %configure --disable-static
 
-make %{?_smp_mflags}
+# manually set PTHREAD_LIBS to include -lpthread until libtool bogosity is fixed,
+# https://bugzilla.redhat.com/show_bug.cgi?id=661333
+make %{?_smp_mflags} PTHREAD_LIBS="-pthread -lpthread"
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 rm -f  $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
 %check
-export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
+export PKG_CONFIG_PATH=$RPM_BUILD_ROOT%{_datadir}/pkgconfig:$RPM_BUILD_ROOT%{_libdir}/pkgconfig
 test "$(pkg-config --modversion IlmBase)" = "%{version}"
 %ifarch %{ix86}
 make check ||:
@@ -86,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 17 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.2.0-1
+- update to 2.2.0
+- added Patch51 and 53 from Fedora
+
 * Mon Dec 30 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.1.0-1
 - update to 2.1.0
 - remove Patch50

+ 10 - 7
k/kdebase-runtime/kdebase-runtime-vl.spec

@@ -4,7 +4,7 @@ Name:          kdebase-runtime
 Summary:       KDE Runtime
 Summary(ja):   KDE ランタイム
 Version:       4.12.5
-Release:       1%{?_dist_release}
+Release:       2%{?_dist_release}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -60,12 +60,13 @@ BuildRequires: gpgme-devel
 BuildRequires: kdelibs-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 BuildRequires: kactivities-devel >= %{version}
+BuildRequires: libXpm-devel
+BuildRequires: libXScrnSaver-devel
 BuildRequires: libcanberra-devel 
 #BuildRequires: libqzeitgeist-devel 
 BuildRequires: libsmbclient-devel
 BuildRequires: libssh-devel >= 0.4.2
-BuildRequires: libXpm-devel
-BuildRequires: libXScrnSaver-devel
+BuildRequires: libwebp-devel
 BuildRequires: NetworkManager-devel
 BuildRequires: nepomuk-core
 BuildRequires: nepomuk-core-devel
@@ -204,20 +205,16 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/kde4/plugins/phonon_platform/kde.so
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/crystalsvg &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %posttrans
-gtk-update-icon-cache %{_datadir}/icons/crystalsvg &> /dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null ||:
 update-mime-database %{_datadir}/mime &> /dev/null
 
 %postun
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/crystalsvg &> /dev/null || :
     touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-    gtk-update-icon-cache %{_datadir}/icons/crystalsvg &> /dev/null || :
     gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
     update-desktop-database -q &> /dev/null ||:
     update-mime-database %{_datadir}/mime &> /dev/null
@@ -278,6 +275,7 @@ fi
 %{_datadir}/locale/currency/
 %{?flags:%exclude %{_datadir}/locale/l10n/*/flag.png}
 %{_datadir}/services/khelpcenter.desktop
+%{_datadir}/mime/packages/webp.xml
 
 %files devel
 %defattr(-,root,root,-)
@@ -296,6 +294,7 @@ fi
 %exclude %{_libdir}/kde4/kcm_*.so
 %exclude %{_libdir}/kde4/kded_*.so
 %{_libdir}/kde4/plugins/phonon_platform/
+%{_libdir}/kde4/plugins/imageformats/kimg_webp.so
 
 %files flags
 %defattr(-,root,root,-)
@@ -303,6 +302,10 @@ fi
 
 
 %changelog
+* Thu Dec 18 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.12.5-2
+- rebuilt with OpenEXR 2.2.0
+- added BR: libwebp-devel
+
 * Tue May 06 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.12.5-1
 - new upstream release
 

+ 6 - 3
k/kdelibs/kdelibs-vl.spec

@@ -1,4 +1,4 @@
-%define _qt4_ver 4.8.5
+%define _qt4_ver 4.8.6
 %define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo %{qt4_ver})
 %define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_version})
 %define _qt4_libdir %(pkg-config --variable libdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/lib)
@@ -14,7 +14,7 @@ Summary: KDE Libraries
 Summary(ja): KDE ライブラリ
 Name: kdelibs
 Version: 4.12.5
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -469,7 +469,7 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
 %exclude %{_bindir}/kde4-doxygen.sh
 %exclude %{_datadir}/kde4/apps/kdewidgets/
 %exclude %{_datadir}/kde4/apps/cmake/
-%exclude %{_mandir}/man1/kdecmake.1*
+#exclude %{_mandir}/man1/kdecmake.1*
 %exclude %{_mandir}/man1/makekdewidgets.1*
 
 %files common
@@ -504,6 +504,9 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
 %doc %{_docdir}/HTML/en/kdelibs4-apidocs
 
 %changelog
+* Thu Dec 18 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.12.5-4
+- rebuilt with OpenEXR 2.2.0
+
 * Wed Jul 16 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.12.5-3
 - rebuild with libpng-1.6.12
 

+ 10 - 1
k/kdelibs3/kdelibs3-vl.spec

@@ -8,7 +8,7 @@ Summary: KDE 3 Libraries
 Summary(ja): KDE 3 ライブラリ
 Name: kdelibs3
 Version: 3.5.10
-Release: 9%{?_dist_release}
+Release: 10%{?_dist_release}
 
 License: LGPLv2
 URL: http://www.kde.org/
@@ -53,6 +53,8 @@ Patch55: kdelibs-3.5.10-latex-syntax-kile-2.0.3.patch
 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
+# fix FTBFS with CUPS 2.0 due to bad CUPS_VERSION_MAJOR checks
+Patch58: kdelibs-3.5.10-cups20.patch
 
 # Other patches
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
@@ -243,6 +245,7 @@ format for easy browsing
 %patch55 -p1 -b .latex-syntax
 %patch56 -p1 -b .qcolor_gcc_ftbfs
 %patch57 -p1 -b .cups-util
+%patch58 -p1 -b .cups20
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
@@ -580,6 +583,12 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 %endif
 
 %changelog
+* Thu Dec 18 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.5.10-10
+- rebuilt with OpenEXR 2.2.0
+- added Patch58 from Fedora to built with cups 2.0.0
+  * Tue Nov 25 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.10-65
+  - fix FTBFS with CUPS 2.0 due to bad CUPS_VERSION_MAJOR checks
+
 * Mon Oct 27 2014 Ryoichi INAGAKI <ryo1@toki.wakwak.jp> 3.5.10-9
 - omit %{_bindir}/kmailservice and %{_bindir}/ktelnetservice