Attachment 291577 Details for Bug 427667 – spec file patch fix japanese and minor cleanups

[patch] spec file patch fix japanese and minor cleanups

xdvi.spec-pat.diff (text/plain), 4.60 KB, created by Patrice Dumas on 2008-01-14 09:33:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2008-01-14 09:33:10 UTC

Size: 4.60 KB

patch

obsolete

>--- xdvik.spec	2008-01-13 23:20:34.000000000 +0100
>+++ xdvik.spec-pat	2008-01-14 10:27:51.000000000 +0100
>@@ -1,4 +1,4 @@
>-%define enable_japanese 1
>+%bcond_without japanese
> %define desktop_file_utils_version 0.9
> %{!?_texmf_main: %define _texmf_main %{_datadir}/texmf}
> 
>@@ -7,13 +7,16 @@
> Version:	22.84.13
> Release:	3%{?dist}
> Url:		http://xdvi.sourceforge.net/
>-License: 	GPLv2 and BSD and Public Domain and LGPLv2+ and GPLv2+ and LPPL
>+# encodings.c is GPLv2+ and LGPL and MIT
>+# read-mapfile.c tfmload.c are from dvips
>+# remaining is MIT
>+License: 	GPLv2+
> Group:		Applications/Publishing
> Obsoletes: 	tetex-xdvi < 3.0-99
> Provides: 	tetex-xdvi = 3.0-99
> Obsoletes: 	xdvi
> Provides: 	xdvi
>-Requires:	texlive-dvips texlive-texmf kpathsea Xaw3d
>+Requires:	texlive-dvips texlive-texmf
> Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
> 
> BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>@@ -23,14 +26,14 @@
> BuildRequires:	autoconf213
> BuildRequires:	libtool
> BuildRequires:	kpathsea-devel
>-%if %{enable_japanese}
>+%if %{with japanese}
> BuildRequires:  freetype-devel >= 2.1.10
> %endif
> 
> Source0:	http://kent.dl.sourceforge.net/sourceforge/xdvi/%{name}-%{version}.tar.gz
> # Source30 is http://xdvi.sourceforge.net/xdvi48x48.gif converted to png
> Source30:	xdvi48x48.png
>-%if %{enable_japanese}
>+%if %{with japanese}
> Source100:	vfontmap
> %endif
> 
>@@ -40,7 +43,7 @@
> Patch4:       	texlive-source-xdvi-numlock.patch
> Patch5:         xdvik-22.84.13-xdgopen.patch
> 
>-%if %{enable_japanese}
>+%if %{with japanese}
> # Japanese patch for xdvi from http://sourceforge.jp/projects/xdvi/
> Patch1000:	http://globalbase.dl.sourceforge.jp/xdvi/28452/%{name}-%{version}-j1.34.patch.gz
> Patch1001:	pxdvik-22.84.13.patch
>@@ -77,7 +80,7 @@
> # Allow Xaw3d enabled build of xdvi
> sed -i 's|/Xaw/|/Xaw3d/|' texk/xdvik/gui/*.[ch] texk/xdvik/*.[ch]
> 
>-%if %{enable_japanese}
>+%if %{with japanese}
> # set up Japanese xdvi in its own directory
> cp -a texk/xdvik texk/pxdvik
> 
>@@ -106,7 +109,7 @@
> 
> # Re-run autoconf against patched Makefile.ins
> ( cd texk/xdvik ; autoconf-2.13 -m $RPM_BUILD_DIR/%{name}-%{version}/texk/etc/autoconf )
>-%if %{enable_japanese}
>+%if %{with japanese}
> ( cd texk/pxdvik ; autoconf-2.13 -m $RPM_BUILD_DIR/%{name}-%{version}/texk/etc/autoconf )
> %endif
> ( cd texk ; autoconf-2.13 -m $RPM_BUILD_DIR/%{name}-%{version}/texk/etc/autoconf )
>@@ -121,7 +124,7 @@
> cp -p texk/make/rdepend.mk texk/make/rdepend.mk.maint
> sed -i -e 's/@MAINT@//' texk/make/rdepend.mk
> 
>-%if %{enable_japanese}
>+%if %{with japanese}
> # configure pxdvi with more options
> pushd texk/pxdvik
> sh `grep "# ./con" config.status |sed -e s/^#\ //` --program-prefix=p --with-default-dvips-path=pdvips
>@@ -136,7 +139,7 @@
> 
> %configure --with-system-t1lib --with-xdvi-x-toolkit=xaw3d
> 
>-%if %{enable_japanese}
>+%if %{with japanese}
> # configure pxdvi with more options
> pushd texk/pxdvik
> sh `grep "# ./con" config.status |sed -e s/^#\ //` --program-prefix=p --with-default-dvips-path=pdvips
>@@ -155,11 +158,15 @@
> %install
> rm -rf $RPM_BUILD_ROOT
> 
>+%if %{with japanese}
>+install_dirs='INSTDIRS=texk/xdvik texk/pxdvik'
>+%endif
>+
> # make install DESTDIR=$RPM_BUILD_ROOT doesn't work here
> %makeinstall \
>         texmf=$RPM_BUILD_ROOT%{_texmf_main} \
>         texmfmain=$RPM_BUILD_ROOT%{_texmf_main} \
>-	INSTDIRS="texk/xdvik texk/pxdvik" \
>+	"$install_dirs" \
> 	INSTALL='install -p'
> 
> # desktop file
>@@ -171,7 +178,7 @@
> Comment=DVI viewer for TeX DVI files
> Icon=xdvi
> MiniIcon=mini-doc1.xpm
>-Exec=%{_bindir}/xdvi
>+Exec=xdvi
> MimeType=application/x-dvi;
> NoDisplay=true
> EOF
>@@ -189,7 +196,7 @@
> # Remove uneeded file
> rm $RPM_BUILD_ROOT%{_texmf_main}/release-tetex-src.txt
> 
>-%if %{enable_japanese}
>+%if %{with japanese}
> mkdir -p pxdvik/READMEs
> pushd texk/pxdvik
> for i in CHANGES.xdvik-jp README.xdvik-jp READMEs/* ; do
>@@ -203,7 +210,7 @@
> 
> %post
> %{_bindir}/texconfig-sys rehash 2> /dev/null || :
>-%{_bindir}/update-desktop-database %{_datadir}/applications || :
>+update-desktop-database &> /dev/null || :
> touch --no-create %{_datadir}/icons/hicolor
> if [ -x %{_bindir}/gtk-update-icon-cache ]; then
>   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
>@@ -211,6 +218,7 @@
> 
> %postun
> %{_bindir}/texconfig-sys rehash 2> /dev/null || :
>+update-desktop-database &> /dev/null || :
> touch --no-create %{_datadir}/icons/hicolor
> if [ -x %{_bindir}/gtk-update-icon-cache ]; then
>   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
>@@ -234,7 +242,7 @@
> %{_datadir}/icons/hicolor/48x48/apps/xdvi.png
> %{_datadir}/applications/fedora-xdvi.desktop
> 
>-%if %{enable_japanese}
>+%if %{with japanese}
> %doc pxdvik/
> %{_bindir}/opxdvi
> %{_bindir}/pxdvi

Actions: View | Diff

Attachments on bug 427667: 291513 | 291514 | 291577