Attachment 291513 Details for Bug 427667 – remove kpathsea directory + minor fcleanups

[patch] remove kpathsea directory + minor fcleanups

xdvik.spec.diff (text/plain), 3.00 KB, created by Patrice Dumas on 2008-01-13 20:49:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2008-01-13 20:49:57 UTC

Size: 3.00 KB

patch

obsolete

>--- xdvik.spec-old	2008-01-13 21:27:01.000000000 +0100
>+++ xdvik.spec	2008-01-13 21:39:48.000000000 +0100
>@@ -39,6 +39,8 @@
> Patch3: 	texlive-xdvi-maxchar.patch
> Patch4:       	texlive-source-xdvi-numlock.patch
> 
>+Patch5:         xdvik-22.84.13-xdgopen.patch
>+
> %if %{enable_japanese}
> Patch1000:	http://globalbase.dl.sourceforge.jp/xdvi/28452/%{name}-%{version}-j1.34.patch.gz
> Patch1001:	pxdvik-22.84.13.patch
>@@ -72,14 +74,11 @@
> %patch3 -p1
> %patch4 -p0
> 
>+%patch5 -p1 -b .xdgopen
>+
> # Allow Xaw3d enabled build of xdvi
> sed -i 's|/Xaw/|/Xaw3d/|' texk/xdvik/gui/*.[ch] texk/xdvik/*.[ch]
> 
>-# Replace htmlview with the preferred xdg-open
>-for i in texk/xdvik/browser.c texk/xdvik/gui/xm_prefsP.h texk/xdvik/xdvi.1.in ; do
>-    sed -i 's/htmlview/xdg-open/g' $i
>-done
>-
> %if %{enable_japanese}
> # set up Japanese xdvi in its own directory
> cp -a texk/xdvik texk/pxdvik
>@@ -102,7 +101,7 @@
> %endif
> 
> # Build xdvik against system libs
>-%patch2000 -p1
>+%patch2000 -p1 -b .use-system-libs
> 
> # Fix unin32_t problem for xdvik (pxdvik is already fixed by Patch1000)
> %patch2001 -p0
>@@ -116,7 +115,27 @@
> 
> %build
> %configure --with-system-t1lib --with-xdvi-x-toolkit=xaw3d
>-		
>+
>+mv texk/kpathsea texk/kpathsea-keep
>+
>+cp -p texk/make/rdepend.mk texk/make/rdepend.mk.maint
>+sed -i -e 's/@MAINT@//' texk/make/rdepend.mk
>+
>+%if %{enable_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
>+popd
>+
>+make -C texk/pxdvik/ depend
>+%endif
>+
>+make -C texk/xdvik/ depend
>+
>+mv texk/kpathsea-keep texk/kpathsea
>+
>+%configure --with-system-t1lib --with-xdvi-x-toolkit=xaw3d
>+
> %if %{enable_japanese}
> # configure pxdvi with more options
> pushd texk/pxdvik
>@@ -124,12 +143,14 @@
> popd
> %endif
> 
>+rm -rf libs texk/contrib/ texk/kpathsea
>+
> make %{?_smp_mflags}
> 
> # Doc files (the full list of changes is in the texk/xdvik/CHANGES file)
>-rm -rf CHANGES
> iconv -f ISO-8859-1 -t UTF8 texk/xdvik/CHANGES -o CHANGES
>-cp texk/xdvik/README.t1* .
>+touch -r texk/xdvik/CHANGES CHANGES
>+cp -p texk/xdvik/README.t1* .
> 
> %install
> rm -rf $RPM_BUILD_ROOT
>@@ -138,7 +159,8 @@
> %makeinstall \
>         texmf=$RPM_BUILD_ROOT%{_texmf_main} \
>         texmfmain=$RPM_BUILD_ROOT%{_texmf_main} \
>-	INSTDIRS="texk/xdvik texk/pxdvik"
>+	INSTDIRS="texk/xdvik texk/pxdvik" \
>+	INSTALL='install -p'
> 
> # desktop file
> cat > xdvi.desktop <<EOF
>@@ -159,7 +181,7 @@
> 
> install -p  -m644 %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps/
> install -p  -m644 %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xdvi.png
>-desktop-file-install --vendor "fedora" --delete-original  \
>+desktop-file-install --vendor "fedora" \
>   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
>   --add-category Graphics \
>   xdvi.desktop
>@@ -173,6 +195,7 @@
> for i in CHANGES.xdvik-jp README.xdvik-jp READMEs/* ; do
>   iconv -f EUC-JP -t UTF-8 ${i} \
>         -o  ../../pxdvik/${i}
>+  touch -r ${i} ../../pxdvik/${i}
> done
> popd
> install -p -m 644 texk/pxdvik/vfontmap.sample.orig pxdvik/vfontmap.sample

Actions: View | Diff

Attachments on bug 427667: 291513 | 291514 | 291577