Browse Source

2015-02-10 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* djview, mtpaint, mtpaint-handbook, wmakerconf: updated
	


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

+ 37 - 28
d/djview/djview-vl.spec

@@ -1,16 +1,23 @@
 Summary: DjVu viewer
-Summary(ja): DjVu 画像形式ファイルのビュアー
+Summary(ja): DjVu 画像ファイルのビュアー
 Name: djview
-Version: 4.7
-Release: 2%{?_dist_release}
-License: GPL
-Group: Applications/Publishing
+Version: 4.9
+Release: 1%{?_dist_release}
+License: GPLv2 and BSD
+Group: Applications/Graphics
 URL: http://djvu.sourceforge.net/djview4.html
+
 Source: http://downloads.sourceforge.net/djvu/%{name}-%{version}.tar.gz
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: qt4-devel >= 4.2
 BuildRequires: djvulibre-devel >= 3.5.19
 BuildRequires: desktop-file-utils
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Requires(post): desktop-file-utils
+Requires(post): shared-mime-info
+Requires(postun): desktop-file-utils
+Requires(postun): shared-mime-info
+
 Distribution: Project Vine
 Vendor: Vine Linux
 Packager: owa
@@ -20,18 +27,18 @@ DjView4 is a viewer and browser plugin for DjVu documents,
 based on the DjVuLibre-3.5 library and the Qt4 toolkit.
 
 %package plugin
-Summary: The plug-in files needed for firefox.
+Summary: The plug-in files needed for Fx browser.
+Summary(ja): Fx ウェブブラウザ用の DjView プラグイン
 Group: Applications/Internet
 Requires: %{name} = %{version}
 Obsoletes: djvulibre-plugin <= 3.5.22
 
 %description plugin
-Djview plug-in files for firefox.
+Djview plug-in files for fx browser.
 
 
 %prep
-%setup -q
-
+%setup -q -n djview4-%{version}
 
 %build
 %configure QTDIR=`pkg-config --variable=prefix Qt`
@@ -43,14 +50,6 @@ rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 mv %{buildroot}/%{_libdir}/netscape %{buildroot}/%{_libdir}/mozilla
 
-# Remove symlinks to djview when there are alternatives
-if test -x /usr/sbin/update-alternatives ; then
-  test -h %{buildroot}%{_bindir}/djview \
-    && rm %{buildroot}%{_bindir}/djview
-  test -h %{buildroot}%{_mandir}/man1/djview.1 \
-    && rm %{buildroot}%{_mandir}/man1/djview.1
-fi
-
 cat > %{name}.desktop <<EOF
 [Desktop Entry]
 Encoding=UTF-8
@@ -74,19 +73,23 @@ install -m644 ./desktopfiles/hi64-djview4.png $RPM_BUILD_ROOT%{_datadir}/icons/h
 
 
 %post 
-update-desktop-database -q
-update-mime-database /usr/share/mime > /dev/null 2>&1 || :
-touch %{_datadir}/icons/hicolor
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+
+%posttrans
+update-desktop-database -q &> /dev/null ||:
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+    /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
 %postun
-update-desktop-database -q
-update-mime-database /usr/share/mime > /dev/null 2>&1 || :
-touch %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+    update-desktop-database -q &> /dev/null ||:
+    update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+    if [ -x /usr/bin/gtk-update-icon-cache ]; then
+	/usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+    fi
 fi
 
 %clean
@@ -100,7 +103,7 @@ rm -rf %{buildroot}
 %{_datadir}/djvu/djview4
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/*.png
-%{_mandir}
+%{_mandir}/*
 
 %files plugin
 %defattr(-, root, root)
@@ -108,6 +111,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Feb 09 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.9-1
+- updated to 4.9
+- built with current VineSeed
+- moved to Applications/Graphics
+- used 'fx' as browser name at plugin subpackage summary
+
 * Mon May 02 2011 Shu KONNO <owa@bg.wakwak.com> 4.7-2
 - install desktop files
 

+ 15 - 10
m/mtpaint-handbook/mtpaint-handbook-vl.spec

@@ -1,16 +1,20 @@
 %define	src_name  mtpaint_handbook
-Summary:	Handbook for the mtpaint painting application
-Summary(ja):	mtPaint ハンドブック
+
 Name:		mtpaint-handbook
-Version:	3.31
+Version:	3.40
 Release:	1%{?_dist_release}
+Summary:	Handbook for the mtpaint painting application
+Summary(ja):	mtPaint ハンドブック
+
 License:	GFDL
-Group:		Applications/Graphics
+Group:		Applications/Documentation
 URL:		http://mtpaint.sourceforge.net/
 Source:		http://downloads.sf.net/%{name}/%{src_name}-%{version}.zip
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	nkf unzip
+
 BuildArch:	noarch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires:	nkf unzip
+Requires:       mtpaint = %{version}
 
 %description
 mtPaint is a simple painting program designed for creating icons and
@@ -20,11 +24,9 @@ Install this package is want to read the handbook for the painting
 application mtpaint.
 
 %description -l ja
-mtPaint はシンプルなアイコンやピクセルベースの画像の作成用に
-デザインされたペイントプログラムです。
+mtPaint はシンプルなアイコンやピクセルベースの画像の作成用にデザインされたペイントプログラムです。
 
-mtPaint のハンドブックが必要な場合はこのパッケージをインストール
-してください。
+mtPaint のハンドブックが必要な場合はこのパッケージをインストールしてください。
 
 
 %prep
@@ -47,6 +49,9 @@ nkf --unix --overwrite docs/{en_GB,cs}/*.html
 %doc COPYING docs/*
 
 %changelog
+* Mon Feb  9 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.40-1
+- updated to 3.40
+
 * Thu Mar 11 2010 Kazutaka HARADA <kazutaka@vinelinux.org> 3.31-1
 - initial build for Vine Linux based on fedora development
 - split from mtpaint package

+ 35 - 23
m/mtpaint/mtpaint-vl.spec

@@ -1,20 +1,22 @@
 Summary:	Painting program for creating icons and pixel-based artwork
 Summary(ja):	アイコンやピクセルベースの描画向けのペイントプログラム
 Name:		mtpaint
-Version:	3.31
-Release:	2%{?_dist_release}
+Version:	3.40
+Release:	1%{?_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
+
+Source0:	http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		%{name}-3.40-xdg-open.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	gtk2-devel zlib-devel
 BuildRequires:	libpng-devel giflib-devel libjpeg-devel libtiff-devel
-BuildRequires:	openjpeg-devel
+BuildRequires:	openjpeg-devel lcms2-devel freetype2-devel
 BuildRequires:	desktop-file-utils gettext
+# use xdg-open
+Requires:       xdg-utils
 
 %description
 mtPaint is a simple painting program designed for creating icons and
@@ -33,23 +35,28 @@ mtPaint はシンプルなアイコンやピクセルベースの画像の作成
 
 %prep
 %setup -q
-%patch -p1
-#%patch1 -p1
+%patch0 -p1 -b .xdg
 
 # We have moved docs
-%{__sed} -i 's,"/usr/doc/mtpaint/index.html","%{_docdir}/%{name}-handbook-%{version}/index.html",' src/png.c
+%{__sed} -i 's,"/usr/doc/mtpaint/index.html","%{_docdir}/%{name}-handbook-%{version}/index.html",' src/spawn.c
 
 %build
+export CFLAGS="%{optflags} `pkg-config --cflags libopenjpeg`"
+
 # This is not a "normal" configure
-%configure cflags asneeded intl man gtk2 tiff jpeg GIF
+./configure \
+    --prefix=%{_prefix} \
+    cflags asneeded intl man gtk2 tiff jpeg GIF
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-%{__make} install MT_PREFIX=%{buildroot}%{_prefix}            \
-                  MT_MAN_DEST=%{buildroot}%{_mandir}/man1     \
-                  MT_LANG_DEST=%{buildroot}%{_datadir}/locale \
-                  BIN_INSTALL=%{buildroot}%{_bindir}
+%{__make} install \
+    DESTDIR=%{buildroot} \
+    MT_PREFIX=%{_prefix}  \
+    MT_MAN_DEST=%{_mandir} \
+    MT_LANG_DEST=%{_datadir}/locale \
+    BIN_INSTALL=%{_bindir}
 
 # install .desktop
 cat > $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop <<EOF
@@ -80,33 +87,38 @@ EOF
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 if [ -x %{_bindir}/update-desktop-database ] ; then
-  %{_bindir}/update-desktop-database &> /dev/null
+    %{_bindir}/update-desktop-database &> /dev/null
 fi
-exit 0
 
 %postun
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_datadir}/icons/hicolor &>/dev/null
   gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+  if [ -x %{_bindir}/update-desktop-database ] ; then
+      %{_bindir}/update-desktop-database &> /dev/null
+  fi
 fi
-if [ -x %{_bindir}/update-desktop-database ] ; then
-  %{_bindir}/update-desktop-database &> /dev/null
-fi
-exit 0
 
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
 %defattr(-, root, root, -)
 %doc COPYING NEWS README
-%{_mandir}/man1/%{name}*
 %{_bindir}/%{name}
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/%{name}.png
+%{_mandir}/man1/%{name}*
 
 %changelog
+* Mon Feb  9 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.40-1
+- updated to 3.40
+- updated Patch0
+- rebuilt with openjpeg 1.5, libtiff 4.0.3, libpng 1.6.12 and lcms2
+
 * Thu Apr 14 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.31-2
 - rebuilt with openjpeg-1.4
 

+ 60 - 40
w/wmakerconf/wmakerconf-vl.spec

@@ -1,24 +1,44 @@
-Summary: This is a GTK-based configuration tool for Window Maker
-Summary(ja): Window Maker の各種設定を行うツールです
 Name: wmakerconf
-Version: 2.11
-Release: 2%{?_dist_release}
+Version: 2.12
+Release: 1%{?_dist_release}
+Summary: Configuration tool for Window Maker
+Summary(ja): Window Maker の設定ツール
+
 License: GPL
 Group: User Interface/Desktops
 Icon: wmakerconf.xpm
-Source: http://www.starplot.org/wmakerconf/wmakerconf-%{version}.tar.gz
-Source1: wmakerconf-%{version}.ja.po
-Source2: wmakerconf-%{version}.data.ja.po
-
-BuildRequires: xorg-x11-devel
-Requires: libPropList >= 0.10.1
-Requires: WindowMaker-devel >= 0.92.0
-Requires: gtk2 >= 2.8.6
-Requires: perl, gzip, w3m
-Buildroot: %{_tmppath}/%{name}-root
+Source: http://downloads.sf.net/%{name}/wmakerconf_%{version}.tar.gz
+Source1: wmakerconf-2.12-ja.po
+Source2: wmakerconf-2.11.data.ja.po
+
+Patch0:         %{name}-2.9.dif
+Patch1:         %{name}-fix-bad-po.patch
+Patch3:         %{name}-2.9-destdir.patch
+Patch4:         %{name}-2.9-config.patch
+Patch5:         %{name}-no-imlib.patch
+Patch7:         %{name}-2.9-varargs.diff
+Patch9:         %{name}-datarootdir.patch
+Patch10:        %{name}-2.12-wmaker-0.95_support.patch
+# PATCH - Fix SUSE: implicit-pointer-decl
+Patch11:        %{name}-implicit-pointer-decl.patch
+
+Buildroot:     %{_tmppath}/%{name}-%{version}-root
+BuildRequires: WindowMaker
+BuildRequires: WindowMaker-devel >= 0.92.0
+BuildRequires: bison
+BuildRequires: gettext
+BuildRequires: gtk2-devel >= 2.4.0
+BuildRequires: libXpm-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libtiff-devel
+BuildRequires: libwebp-devel
+BuildRequires: perl-libwww-perl
+BuildRequires: tar gzip bzip2
+Requires:      WindowMaker
+Obsoletes:     wmakerconf-data
+
 Vendor: Project Vine
 Distribution: Vine Linux
-Obsoletes: wmakerconf-data
 
 %description
 wmakerconf is a GTK+ based configuration tool for the window manager
@@ -40,45 +60,38 @@ wmakerconf は, Window Maker の各種設定を行う GTK+ ベースの ツー
 
 %prep
 %setup -q
+%patch0 -p0
+#patch1 -p0
+#patch3 -p0
+#patch4 -p0
+#patch5 -p0
+%patch7 -p0
+%patch9 -p0
+%patch10 -p0
+%patch11 -p0
+
 cp %{SOURCE1} po/ja.po
 cp %{SOURCE2} data/po/ja.po
 
+# instead of patch4
+sed -i -e 's|libwww\.pl|scripts\/libwww\.pl|g' configure
 
 %build
-%if 0
-CFLAGS="$RPM_OPT_FLAGS" ./configure \
-	--prefix=%{_prefix} \
-	--datadir=%{_datadir} \
-	--disable-gtktest \
-	--disable-upgrade \
-	--bindir=%{_prefix}/X11R6/bin \
-	--with-wmakerprefix=%{_prefix}/X11R6 \
-%endif
-
-%configure --mandir=%{_datadir}/man
-make %{?_smp_mflags}
-
-%if 0
-libtoolize --copy --force --automake
-aclocal-1.9 -I .
-autoheader
-automake-1.9 --add-missing --gnu --include-deps
-autoconf
-%endif
-
-CFLAGS="$RPM_OPT_FLAGS"
+CFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags gtk+-2.0`"
+CPPFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags gtk+-2.0`"
 NLSDIR=%{_localedir}
 LINGUAS="de es fr it ja"
 GNUSTEP_LOCAL_ROOT='%{_prefix}/lib/GNUstep'
 CPP_PATH=/lib/cpp
-export CFLAGS NLSDIR LINGUAS GNUSTEP_LOCAL_ROOT CPP_PATH
-CFLAGS="$RPM_OPT_FLAGS" ./configure \
+export CFLAGS CPPFLAGS NLSDIR LINGUAS GNUSTEP_LOCAL_ROOT CPP_PATH
+./configure \
 	--prefix=%{_prefix} \
 	--includedir=%{_includedir} \
+	--disable-imlibtest \
 	--with-wmakerdataprefix=%{_datadir} \
 	--with-wmakeretcprefix=%{_sysconfdir}/X11
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} LDFLAGS="-L%{_libdir}"
 
 
 %install
@@ -115,6 +128,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Feb  9 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.12-1
+- updated to 2.12
+- added Patch0, 7, 9, 10 and 11 from OpenSuSE
+- removed BR: imlib-devel
+- added BR: WindowMaker, WindowMaker-devel, libXpm-devel, libjpeg-devel,
+  libtiff-devel, libwebp-devel and perl-libwww-perl
+
 * Mon Feb 22 2010 Shu KONNO <owa@bg.wakwak.com> 2.11-2
 - rebuilt with new toolchain