rpms/xdvik/devel xdvik-22.84.14-pxdvi.patch, NONE, 1.1 xdvik.spec, 1.23, 1.24 texlive-source-xdvi-numlock.patch, 1.1, NONE xdvik-22.84.13-bad_bar.patch, 1.1, NONE xdvik-22.84.13-keepflag-scrollfix.patch, 1.1, NONE xdvik-22.84.13-manpage.patch, 1.1, NONE xdvik-22.84.13-pxdvi-use-system-libs.patch, 1.1, NONE xdvik-22.84.13-tempfix.patch, 1.1, NONE xdvik-22.84.13-uint32_t-fix.patch, 1.2, NONE xdvik-22.84.13-use-system-libs.patch, 1.1, NONE xdvik-22.84.13-windowid.patch, 1.1, NONE
Jonathan G. Underwood (jgu)
fedora-extras-commits at redhat.com
Fri Jul 18 00:45:02 UTC 2008
Author: jgu
Update of /cvs/extras/rpms/xdvik/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1183
Modified Files:
xdvik.spec
Added Files:
xdvik-22.84.14-pxdvi.patch
Removed Files:
texlive-source-xdvi-numlock.patch xdvik-22.84.13-bad_bar.patch
xdvik-22.84.13-keepflag-scrollfix.patch
xdvik-22.84.13-manpage.patch
xdvik-22.84.13-pxdvi-use-system-libs.patch
xdvik-22.84.13-tempfix.patch xdvik-22.84.13-uint32_t-fix.patch
xdvik-22.84.13-use-system-libs.patch
xdvik-22.84.13-windowid.patch
Log Message:
* Fri Jul 18 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-20
- Update to version 22.84.14
- Update Japanese patch to 22.84.14-j1.40
- Rework patch allowing both normal and Japanese versions to be built
- Remove no longer needed patches that have been merged upstream:
- Various spec file fixups
xdvik-22.84.14-pxdvi.patch:
--- NEW FILE xdvik-22.84.14-pxdvi.patch ---
diff -up xdvik-22.84.14/texk/configure.in.pxdvi xdvik-22.84.14/texk/configure.in
--- xdvik-22.84.14/texk/configure.in.pxdvi 2008-05-03 20:45:04.000000000 +0100
+++ xdvik-22.84.14/texk/configure.in 2008-07-17 00:22:02.000000000 +0100
@@ -52,7 +52,7 @@ fi
PKGS='
bibtex8 cjkutils detex devnag dtl dvi2tty dvidvi dviljk dvipdfm dvipsk gsftopk
lacheck makeindexk musixflx odvipsk ps2pkm seetexk tetex tex4htk
- texlive ttf2pk tth xdvik
+ texlive ttf2pk tth xdvik pxdvik
'
ESUBDIRS=
diff -up xdvik-22.84.14/texk/pxdvik/Makefile.in.pxdvi xdvik-22.84.14/texk/pxdvik/Makefile.in
--- xdvik-22.84.14/texk/pxdvik/Makefile.in.pxdvi 2008-07-17 00:22:02.000000000 +0100
+++ xdvik-22.84.14/texk/pxdvik/Makefile.in 2008-07-17 00:26:37.000000000 +0100
@@ -10,6 +10,9 @@ ac_include ../make/cross.mk
all_subdirs = gui tests
+dvipsdir = $(texmf)/pdvips
+psheaderdir = $(dvipsdir)
+
CPP = @CPP@
# Make `#include <X11/...>' and `-lX...' work.
@@ -178,40 +181,40 @@ uninstall-exec:
install-data: $(manpage).1 pixmaps/toolbar.xpm pixmaps/toolbar2.xpm
$(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir)
- $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/xdvi/pixmaps
+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/pxdvi/pixmaps
$(INSTALL_DATA) $(manpage).1 $(man1dir)/$(manpage).$(manext)
rm -f $(man1dir)/o$(manpage).$(manext)
ln -s $(manpage).$(manext) $(man1dir)/o$(manpage).$(manext)
- $(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/xdvi/XDvi
- $(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm $(texmf)/xdvi/pixmaps
+ $(INSTALL_DATA) $(srcdir)/texmf/XDvi $(texmf)/pxdvi/XDvi
+ $(INSTALL_DATA) $(srcdir)/pixmaps/toolbar.xpm $(srcdir)/pixmaps/toolbar2.xpm $(texmf)/pxdvi/pixmaps
if \
- grep 'original xdvi.cfg --' $(texmf)/xdvi/xdvi.cfg >/dev/null 2>&1 \
- || test ! -r $(texmf)/xdvi/xdvi.cfg; \
+ grep 'original xdvi.cfg --' $(texmf)/pxdvi/xdvi.cfg >/dev/null 2>&1 \
+ || test ! -r $(texmf)/pxdvi/xdvi.cfg; \
then \
- $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg $(texmf)/xdvi/xdvi.cfg; \
+ $(INSTALL_DATA) $(srcdir)/texmf/xdvi.cfg $(texmf)/pxdvi/xdvi.cfg; \
else \
true; \
fi
- $(INSTALL_DATA) $(srcdir)/xdvi-ptex.sample $(texmf)/xdvi/
+ $(INSTALL_DATA) $(srcdir)/xdvi-ptex.sample $(texmf)/pxdvi/
if test ! -f $(PTEXMAP); then \
$(INSTALL_DATA) $(srcdir)/xdvi-ptex.sample $(PTEXMAP); \
fi
uninstall-data:
rm -f $(man1dir)/$(manpage).$(manext) \
- $(texmf)/xdvi/pixmaps/toolbar.xpm $(texmf)/xdvi/pixmaps/toolbar2.xpm \
- $(texmf)/xdvi/XDvi
+ $(texmf)/pxdvi/pixmaps/toolbar.xpm $(texmf)/pxdvi/pixmaps/toolbar2.xpm \
+ $(texmf)/pxdvi/XDvi
if \
- head -n 1 $(texmf)/xdvi/xdvi.cfg | grep 'original xdvi.cfg --' >/dev/null 2>&1 \
- || test ! -r $(texmf)/xdvi/xdvi.cfg; \
+ head -n 1 $(texmf)/pxdvi/xdvi.cfg | grep 'original xdvi.cfg --' >/dev/null 2>&1 \
+ || test ! -r $(texmf)/pxdvi/xdvi.cfg; \
then \
- rm -f $(texmf)/xdvi/xdvi.cfg; \
+ rm -f $(texmf)/pxdvi/xdvi.cfg; \
else \
true; \
fi
- rmdir $(texmf)/xdvi/pixmaps
+ rmdir $(texmf)/pxdvi/pixmaps
-distname = xdvik
+distname = pxdvik
program_files = *.1.in *.ac xdvi.icon xdvi.FAQ psheader.txt mksedscript \
MOTIF
version_files = xdvi.c
diff -up xdvik-22.84.14/texk/pxdvik/texmf/XDvi.pxdvi xdvik-22.84.14/texk/pxdvik/texmf/XDvi
--- xdvik-22.84.14/texk/pxdvik/texmf/XDvi.pxdvi 2008-07-17 00:22:02.000000000 +0100
+++ xdvik-22.84.14/texk/pxdvik/texmf/XDvi 2008-07-17 00:22:02.000000000 +0100
@@ -137,7 +137,7 @@ Ctrl<Btn5Down>:set-shrink-factor(-)\n\
!!!------------------------------------------------------------------------------
!!! note: when i18n'ed, *font and *fontSet should have same size of font
*international: true
-*inputMethod: kinput2
+*inputMethod: SCIM
*preeditType: OverTheSpot,OffTheSpot,Root
!!! note: xdviSelFile can not be i18n'ed (bug?)
xdviSelFile*international: false
diff -up xdvik-22.84.14/texk/pxdvik/xdvi-sh.in.pxdvi xdvik-22.84.14/texk/pxdvik/xdvi-sh.in
--- xdvik-22.84.14/texk/pxdvik/xdvi-sh.in.pxdvi 2007-10-18 17:28:55.000000000 +0100
+++ xdvik-22.84.14/texk/pxdvik/xdvi-sh.in 2008-07-17 00:22:02.000000000 +0100
@@ -35,7 +35,7 @@ case "$#:$1" in
NAMEOPT="-name $BASE_NAME";;
esac
-xdviappfile=`kpsewhich -progname=xdvi --format='other text files' XDvi`
+xdviappfile=`kpsewhich -progname=pxdvi --format='other text files' XDvi`
if test -n "$xdviappfile"; then
xdviappdir=`dirname "$xdviappfile"`
xdviapppath="${xdviappdir}/%l_%t/%N:${xdviappdir}/%N"
Index: xdvik.spec
===================================================================
RCS file: /cvs/extras/rpms/xdvik/devel/xdvik.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xdvik.spec 11 May 2008 00:01:28 -0000 1.23
+++ xdvik.spec 18 Jul 2008 00:44:19 -0000 1.24
@@ -6,8 +6,8 @@
Summary: An X viewer for DVI files
Name: xdvik
-Version: 22.84.13
-Release: 20%{?dist}
+Version: 22.84.14
+Release: 1%{?dist}
Url: http://xdvi.sourceforge.net/
# encodings.c is GPLv2+ and LGPL and MIT
# read-mapfile.c tfmload.c are from dvips
@@ -44,71 +44,19 @@
# This patch not pushed upstream. Unclear if it's actually still needed.
Patch1: texlive-2007-xprint.patch
-# Fix for navigation with a spacebar does not keep position
-# https://bugzilla.redhat.com/show_bug.cgi?id=417461
-# https://bugzilla.redhat.com/show_bug.cgi?id=168124
-# http://sourceforge.net/tracker/index.php?func=detail&aid=1875311&group_id=23164&atid=377580
-# Fixed in upstream CVS post 22.84.13
-Patch2: xdvik-22.84.13-keepflag-scrollfix.patch
-
-# Fix numlock key behaviour.
-# http://sourceforge.net/tracker/index.php?func=detail&aid=1875321&group_id=23164&atid=377580
-# Fixed in upstream CVS post 22.84.13
-Patch3: texlive-source-xdvi-numlock.patch
-
-# Fix browser open command to use xdg-open
-# http://sourceforge.net/tracker/index.php?func=detail&aid=1875309&group_id=23164&atid=377580
-# Fixed in upstream CVS post 22.84.13
-Patch4: xdvik-22.84.13-xdgopen.patch
-
-# Fix security issues with temp file creation
-# https://sourceforge.net/tracker/index.php?func=detail&aid=1953026&group_id=23164&atid=377580
-# Fixed in upstream CVS post 22.84.13
-Patch5: xdvik-22.84.13-tempfix.patch
-
-# Fix typos in man pages.
-# http://sourceforge.net/tracker/index.php?func=detail&aid=1833567&group_id=23164&atid=377580
-# Fixed in upstream CVS post 22.84.13
-Patch6: xdvik-22.84.13-manpage.patch
-
-# Fix for a double Ctrl-L segfault (BZ #429429)
-# https://sourceforge.net/tracker/index.php?func=detail&aid=1953028&group_id=23164&atid=377580
-# Fixed in upstream CVS post 22.84.13
-Patch7: xdvik-22.84.13-bad_bar.patch
-
-# Fix bug with returning window ID.
-# https://bugzilla.redhat.com/show_bug.cgi?id=442445
-# https://sourceforge.net/tracker/index.php?func=detail&aid=1953023&group_id=23164&atid=377580
-# Fixed in upstream CVS post 22.84.13
-Patch8: xdvik-22.84.13-windowid.patch
-
%if %{with japanese}
# Japanese patch for xdvi from http://sourceforge.jp/projects/xdvi/
-Patch1000: xdvik-22.84.13-j1.40.patch.gz
+Patch1000: xdvik-22.84.14-j1.40.patch.gz
# Patch to allow building of both xdvik and pxdvik.
# Local to Fedora, not appropriate to push upstream.
-Patch1001: xdvik-22.84.13-pxdvi.patch
+Patch1001: xdvik-22.84.14-pxdvi.patch
-# Patch to fix up some issues when using system installed libraries.
-# http://sourceforge.net/tracker/index.php?func=detail&aid=1875314&group_id=23164&atid=377580
-# Fixed in upstream CVS post 22.84.13
-Patch1002: xdvik-22.84.13-pxdvi-use-system-libs.patch
%endif
-# These patches would conflict with Patch1000 and friends and so must be applied after the
-# xdvik directory has been copied to pxdvik
-
-# Patch to fix up some issues when using system installed libraries.
-# http://sourceforge.net/tracker/index.php?func=detail&aid=1875314&group_id=23164&atid=377580
-# Fixed in upstream CVS post 22.84.13
-Patch2000: xdvik-22.84.13-use-system-libs.patch
-
-# Fix conflicting definitions of unint32_t
-# http://sourceforge.net/tracker/index.php?func=detail&aid=1875318&group_id=23164&atid=377580
-# http://sourceforge.net/tracker/index.php?func=detail&aid=1819017&group_id=23164&atid=377583
-# Fixed in upstream CVS post 22.84.13
-Patch2001: xdvik-22.84.13-uint32_t-fix.patch
+# These patches would conflict with Patch1000 and friends and so must be applied
+# after the xdvik directory has been copied to pxdvik
+# Currently no patches of this type
%description
Xdvik, the kpathsea version of xdvi, is a previewer for DVI files
@@ -123,15 +71,6 @@
%prep
%setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p0
-%patch4 -p1 -b .xdgopen
-%patch5 -p1 -b .tempfix
-%patch6 -p0
-%patch7 -p1
-%patch8 -p1 -b .windowid
-
# Allow Xaw3d enabled build of xdvi
sed -i 's|/Xaw/|/Xaw3d/|' texk/xdvik/gui/*.[ch] texk/xdvik/*.[ch]
@@ -147,23 +86,12 @@
# Build both the normal and the Japanese xdvi at the same time
%patch1001 -p1 -b .pxdvi
-# Build pxdvik against system libs
-%patch1002 -p1 -b .pxdvi-use-system-libs
-
# XXX Is this really necessary?
mv texk/pxdvik/xdvi-ptex.sample texk/pxdvik/xdvi-ptex.sample.orig
install -p -m 644 %{SOURCE100} texk/pxdvik/xdvi-ptex.sample
%endif
-# Build xdvik against system libs
-%patch2000 -p1 -b .use-system-libs
-
-%if !%{with_japanese}
-# Fix unin32_t problem for xdvik (Patch1000 also contains this hunk)
-%patch2001 -p1
-%endif
-
# Re-run autoconf against patched Makefile.ins
( cd texk/xdvik ; autoconf-2.13 -m $RPM_BUILD_DIR/%{name}-%{version}/texk/etc/autoconf )
%if %{with japanese}
@@ -174,10 +102,11 @@
%build
# Here we go to great pains to avoid the automatic dependency generation from pulling in the
# bundled kpathsea stuff
-%configure --with-system-t1lib --with-xdvi-x-toolkit=xaw3d
+%configure --with-system-t1lib --with-system-kpathsea --with-xdvi-x-toolkit=xaw3d
mv texk/kpathsea texk/kpathsea-keep
+# Enable maintainer mode (see README_maintainer in tarball)
cp -p texk/make/rdepend.mk texk/make/rdepend.mk.maint
sed -i -e 's/@MAINT@//' texk/make/rdepend.mk
@@ -194,7 +123,7 @@
mv texk/kpathsea-keep texk/kpathsea
-%configure --with-system-t1lib --with-xdvi-x-toolkit=xaw3d
+%configure --with-system-t1lib --with-system-kpathsea --with-xdvi-x-toolkit=xaw3d
%if %{with japanese}
# configure pxdvi with more options
@@ -218,6 +147,8 @@
%if %{with japanese}
install_dirs='INSTDIRS=texk/xdvik texk/pxdvik'
+%else
+install_dirs='INSTDIRS=texk/xdvik'
%endif
# make install DESTDIR=$RPM_BUILD_ROOT doesn't work here
@@ -290,12 +221,10 @@
%doc README README.t1mapper README.t1fonts CHANGES
%{_bindir}/oxdvi
%{_bindir}/xdvi
-%{_bindir}/xdvizilla
%{_bindir}/xdvi-xaw3d
%{_texmf_main}/xdvi/
%{_mandir}/man1/oxdvi.1*
%{_mandir}/man1/xdvi.1*
-%{_mandir}/man1/xdvizilla.1*
%{_datadir}/pixmaps/xdvi48x48.png
%{_datadir}/icons/hicolor/48x48/apps/xdvi.png
%{_datadir}/applications/fedora-xdvi.desktop
@@ -304,12 +233,18 @@
%doc pxdvik/
%{_bindir}/opxdvi
%{_bindir}/pxdvi
-%{_bindir}/pxdvizilla
%{_bindir}/pxdvi-xaw3d
%{_texmf_main}/pxdvi/
%endif
%changelog
+* Fri Jul 18 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-20
+- Update to version 22.84.14
+- Update Japanese patch to 22.84.14-j1.40
+- Rework patch allowing both normal and Japanese versions to be built
+- Remove no longer needed patches that have been merged upstream:
+- Various spec file fixups
+
* Sat May 10 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-20
- Update Japanese patch to xdvik-22.84.13-j1.40.patch.gz
- Rework patch to allow simultaneous building of xdvik and pxdvik - now called
--- texlive-source-xdvi-numlock.patch DELETED ---
--- xdvik-22.84.13-bad_bar.patch DELETED ---
--- xdvik-22.84.13-keepflag-scrollfix.patch DELETED ---
--- xdvik-22.84.13-manpage.patch DELETED ---
--- xdvik-22.84.13-pxdvi-use-system-libs.patch DELETED ---
--- xdvik-22.84.13-tempfix.patch DELETED ---
--- xdvik-22.84.13-uint32_t-fix.patch DELETED ---
--- xdvik-22.84.13-use-system-libs.patch DELETED ---
--- xdvik-22.84.13-windowid.patch DELETED ---
More information about the fedora-extras-commits
mailing list