Browse Source

update: freeimage, koffice, mtpaint, openjpeg, poppler

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

+ 9 - 3
f/freeimage/freeimage-vl.spec

@@ -5,18 +5,21 @@ Summary:        Multi-format image decoder library
 Summary(ja):    マルチフォーマット画像デコードライブラリ
 Name:           freeimage
 Version:        3.10.0
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
+
 Group:          System Environment/Libraries
 # freeimage is dual-licensed, see Whatsnew.txt (search for license) or:
 # http://freeimage.sourceforge.net/license.html
 License:        GPL+ or MPLv1.0
 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
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  libjpeg-devel libpng-devel libtiff-devel OpenEXR-devel
-BuildRequires:  libmng-devel openjpeg-devel doxygen
+BuildRequires: libjpeg-devel libpng-devel libtiff-devel OpenEXR-devel
+BuildRequires: libmng-devel openjpeg-devel doxygen
 
 %description
 FreeImage is a library for developers who would like to support popular
@@ -116,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 14 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 3.10.0-2
+- rebuilt with openjpeg-1.4
+
 * Thu Jun 11 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 3.10.0-1
 - initial build for Vine Linux
 

+ 13 - 2
k/koffice/koffice-vl.spec

@@ -4,7 +4,7 @@ Name: koffice
 Summary: An integrated office suite for KDE
 Summary(ja): KDE 向け統合オフィススイート
 Version: 2.3.3
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 Epoch: 1
 
 Group: Applications/Productivity
@@ -111,8 +111,9 @@ The applications currently included in KOffice are:
 
 %package core
 Summary: Core support files for koffice
+Summary(ja): KOffice のコアファイル
 Group: Applications/Productivity
-#Requires:       lilypond-emmentaler-fonts
+#Requires: lilypond-emmentaler-fonts
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 Requires: kdebase-runtime >= %{_kde4_version}
 #Requires: lyx-fonts
@@ -185,6 +186,7 @@ animation and more.
 
 %package kpresenter-libs
 Summary: Runtime libraries for %{name}-kpresenter
+Summary(ja): %{name}-kpresenter のランタイムライブラリ
 Group: System Environment/Libraries
 
 %description kpresenter-libs
@@ -220,6 +222,7 @@ vector images – look no further, Karbon is the tool for you!
 
 %package karbon-libs
 Summary: Runtime libraries for %{name}-karbon
+Summary(ja): %{name}-karbon のランタイムライブラリ
 Group: System Environment/Libraries
 
 %description karbon-libs
@@ -248,6 +251,7 @@ Krita’s vision statement is:
 
 %package krita-libs
 Summary: Runtime libraries for %{name}-krita
+Summary(ja): %{name}-krita のランタイムライブラリ
 Group: System Environment/Libraries
 
 %description krita-libs
@@ -314,6 +318,7 @@ Requires: %{name}-kchart-libs = %{epoch}:%{version}-%{release}
 
 %package kchart-libs
 Summary: Runtime libraries for %{name}-kchart
+Summary(ja): %{name}-kchart のランタイムライブラリ
 Group: System Environment/Libraries
 Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 
@@ -322,6 +327,7 @@ Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 
 %package kformula
 Summary: A powerful formula editor
+Summary(ja): 強力な数式エディタ
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Requires: %{name}-kformula-libs = %{epoch}:%{version}-%{release}
@@ -333,6 +339,7 @@ Requires: %{name}-kformula-libs = %{epoch}:%{version}-%{release}
 
 %package kformula-libs
 Summary: Runtime libraries for %{name}-kformula
+Summary(ja): %{name}-kformula のランタイムライブラリ
 Group: System Environment/Libraries
 
 %description kformula-libs
@@ -340,6 +347,7 @@ Group: System Environment/Libraries
 
 %package filters
 Summary: Import and Export Filters for KOffice
+Summary(ja): KOffice で使用するインポート/エクスポートフィルタ集
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 # for karbon eps import filter
@@ -1021,6 +1029,9 @@ fi
 
 
 %changelog
+* Sat Apr 16 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1:2.3.3-3
+- rebuilt with openjpeg-1.4
+
 * Tue Apr 12 2011 Shu KONNO <owa@bg.wakwak.com> 1:2.3.3-2
 - rebuilt with postgresql-9.0.3
 

+ 7 - 2
m/mtpaint/mtpaint-vl.spec

@@ -2,16 +2,18 @@ Summary:	Painting program for creating icons and pixel-based artwork
 Summary(ja):	アイコンやピクセルベースの描画向けのペイントプログラム
 Name:		mtpaint
 Version:	3.31
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 License:	GPLv3+
 Group:		Applications/Graphics
 URL:		http://mtpaint.sourceforge.net/
 Source:		http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2
 Patch:		%{name}-3.19-xdg-open.patch
 #Patch1:		%{name}-3.19-openjpeg.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	gtk2-devel zlib-devel
 BuildRequires:	libpng-devel giflib-devel libjpeg-devel libtiff-devel
+BuildRequires:	openjpeg-devel
 BuildRequires:	desktop-file-utils gettext
 
 %description
@@ -105,6 +107,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Thu Apr 14 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.31-2
+- rebuilt with openjpeg-1.4
+
 * Thu Mar 11 2010 Kazutaka HARADA <kazutaka@vinelinux.org> 3.31-1
 - initial build for Vine Linux based on fedora development
 

+ 70 - 38
o/openjpeg/openjpeg-vl.spec

@@ -1,18 +1,26 @@
+Name: openjpeg
 Summary: JPEG 2000 codec library
 Summary(ja): JPEG 2000 コーデックライブラリ
-Name:    openjpeg
-Version: 1.2
+Version: 1.4
 Release: 1%{?_dist_release}
-Group:     System Environment/Libraries
-License:   BSD
-URL:       http://www.openjpeg.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Group: System Environment/Libraries
+License: BSD
+URL: http://www.openjpeg.org/
+
+Source0: http://openjpeg.googlecode.com/files/%{name}_v1_4_sources_r697.tgz
 
-Source0: %{name}_v1_2.tar.gz
-Patch1: %{name}-1.2-fix_build.patch
-Patch2: %{name}-1.2-dyn_link_binaries.patch
-Patch3: %{name}-1.2-upstream_fixes.patch
-Patch4: %{name}-1.2-lib64.patch
+## upstreamable patches
+# libopenjpeg has undefined references, http://bugzilla.redhat.com/467661
+# http://groups.google.com/group/openjpeg/browse_thread/thread/fba9ad2a35b12e6a
+Patch50: openjpeg-1.4-no_undefined.patch
+# fix autoconf buildsys (+DESTDIR support mostly) 
+# http://groups.google.com/group/openjpeg/browse_thread/thread/6326363ebb969a99
+Patch52: openjpeg-1.4-autoconf.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: automake libtool 
+BuildRequires: libtiff-devel
+BuildRequires: lcms-devel
 
 %description
 The OpenJPEG library is an open-source JPEG 2000 codec written in C language.
@@ -21,40 +29,50 @@ still-image compression standard from the Joint Photographic Experts Group
 (JPEG).
 
 %package  devel
-Summary:  Development files for openjpeg
-Group:    Development/Libraries
-Requires: openjpeg = %{version}-%{release}
+Summary: Development files for openjpeg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 The openjpeg-devel package contains libraries and header files for
 developing applications that use openjpeg.
 
+%package tools
+Summary: Command-line tools using the JPEG 2000 library
+Group: Applications/Graphics
+Requires: %{name} = %{version}-%{release}
+
+%description tools
+The openjpeg-tools package provides with command-line tools allowing 
+for conversions between several formats.
+
+
 %prep
-%setup -q -n trunk
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-if [ "lib64" = %{_lib} ]; then
-%patch4 -p1
-fi
-find . -type f|xargs chmod 644
+%setup -q -n openjpeg_v1_4_sources_r697 %{?runcheck:-a 1}
+# Make sure we use system libraries
+rm -rf libs
+
+%patch50 -p1 -b .no_undefined
+%patch52 -p1 -b .autoconf
+autoreconf -i -f
 
 %build
-%ifarch i686
-make COMPILERFLAGS="%{optflags} -ffast-math -fPIC \
-                    -march=i686 -O3 -fasynchronous-unwind-tables \
-		    -ftree-vectorize -ftree-vectorizer-verbose=5" \
-     LIBRARIES="-lm" \
-     %{?_smp_mflags}
-%else
-make COMPILERFLAGS="%{optflags} -ffast-math -fPIC" \
-     LIBRARIES="-lm" \
-     %{?_smp_mflags}
-%endif
+%configure \
+    --enable-shared \
+    --disable-static \
+    --enable-lcms2=no \
+    --enable-lcms1=yes
+
+make
 
 %install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} LIBDIR=%{_libdir} INCDIR=%{_includedir}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
+ln -s openjpeg-1.4 $RPM_BUILD_ROOT%{_includedir}/openjpeg
+
 
 %clean
 rm -rf %{buildroot}
@@ -65,16 +83,30 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
+%doc CHANGES LICENSE 
 %{_libdir}/libopenjpeg.so.*
+%{_mandir}/man3/*
 
 %files devel
 %defattr(-,root,root,-)
-%doc ChangeLog
-%{_includedir}/openjpeg.h
+%{_includedir}/openjpeg-1.4/
 %{_libdir}/libopenjpeg.so
-%{_libdir}/libopenjpeg.a
+%{_libdir}/pkgconfig/lib*.pc
+# legacy/compat header locations
+%{_includedir}/openjpeg.h
+%{_includedir}/openjpeg/
+
+%files tools
+%defattr(-,root,root,-)
+%{_bindir}/*
+%{_mandir}/man1/*
 
 %changelog
+* Thu Apr 14 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.4-1
+- updated to 1.4
+- built with current VineSeed
+- added tools subpackage
+
 * Thu Oct 09 2008 Shu KONNO <owa@bg.wakwak.com> 1.2-1vl5
 - applied new versioning policy, spec in utf-8
 

+ 6 - 2
p/poppler/poppler-vl.spec

@@ -1,5 +1,5 @@
 %define name	poppler
-%define version	0.16.3
+%define version	0.16.4
 %define release	1%{?_dist_release}
 
 Summary:	PDF rendering library.
@@ -19,7 +19,7 @@ BuildRequires:	gtk2-devel >= 2.2.0
 BuildRequires:	zlib-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  openjpeg-devel
-BuildRequires:	cairo-devel, gtk-doc
+BuildRequires:	cairo-devel
 BuildRequires:	qt-devel
 BuildRequires:	qt4-devel >= 4.4.0
 BuildRequires:	libXmu-devel
@@ -211,6 +211,10 @@ unset QTDIR && . /etc/profile.d/qt.sh
 %{_mandir}/man1/pdf*
 
 %changelog
+* Thu Apr 14 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.16.4-1
+- new upstream release
+- built with openjpeg-1.4
+
 * Sat Mar 12 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.16.3-1
 - new upstream release
 - added utils subpackage