rpms/tetex/F-7 tetex-3.0-selinux.patch, 1.1, 1.2 tetex-3.0-xdvi-keepflag.patch, 1.2, 1.3 tetex.spec, 1.115, 1.116 ptex-src-3.1.8.1.tar.bz2, 1.1, NONE
Jindrich Novy (jnovy)
fedora-extras-commits at redhat.com
Sun Jan 20 10:18:03 UTC 2008
Author: jnovy
Update of /cvs/extras/rpms/tetex/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11654
Modified Files:
tetex-3.0-selinux.patch tetex-3.0-xdvi-keepflag.patch
tetex.spec
Removed Files:
ptex-src-3.1.8.1.tar.bz2
Log Message:
* Sun Jan 20 2008 Jindrich Novy <jnovy at redhat.com> 3.0-40.5
- fix navigation with a spacebar in xdvi (#417461)
- run restorecon also for /var/lib/texmf/ to have correct selinux
labels (#427066)
- temporarily disable check-buildroot so that we don't get
broken fmt files after buildroot references removal (#325311)
- obsolete only old xdvik version in order to not to clash wih
newer xdvik, which is packaged separately
- remove old tarball added accidentially to CVS in history
tetex-3.0-selinux.patch:
Index: tetex-3.0-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/tetex/F-7/tetex-3.0-selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tetex-3.0-selinux.patch 16 Sep 2006 08:46:02 -0000 1.1
+++ tetex-3.0-selinux.patch 20 Jan 2008 10:17:57 -0000 1.2
@@ -1,11 +1,17 @@
---- tetex-src-3.0/texk/kpathsea/mktexlsr.selinux 2006-09-13 06:38:14.000000000 -0400
-+++ tetex-src-3.0/texk/kpathsea/mktexlsr 2006-09-13 06:37:52.000000000 -0400
-@@ -140,7 +140,7 @@
- until PERMS=`kpsestat = "$db_file"`; do sleep 1; done
- chmod $PERMS "$db_file_tmp"
+--- tetex-src-3.0/texk/kpathsea/mktexlsr.selinux 2007-06-05 15:37:24.000000000 +0200
++++ tetex-src-3.0/texk/kpathsea/mktexlsr 2007-06-05 15:48:15.000000000 +0200
+@@ -136,11 +136,10 @@ for TEXMFLS_R in "$@"; do
+ (cd "$TEXMFLS_R" && \ls -LRa 2>/dev/null) |
+ sed '/^$/{n;s%^\./%%;s%^%./%;}; /^\.$/d; /^\.\.$/d; /^[\.\/]*lsR[0-9]*\.tmp:*$/d' >>"$db_file_tmp"
+
+- # To be really safe, a loop.
+- until PERMS=`kpsestat = "$db_file"`; do sleep 1; done
+- chmod $PERMS "$db_file_tmp"
++ # Don't inherit bad permissions for ls-R files (#220239)
++ chmod 0644 "$db_file_tmp"
rm -f "$db_file"
- mv "$db_file_tmp" "$db_file"
-+ install "$db_file_tmp" "$db_file"
++ cp "$db_file_tmp" "$db_file"
rm -rf "$db_dir_tmp"
done
tty -s && echo "$progname: Done." >&2
tetex-3.0-xdvi-keepflag.patch:
Index: tetex-3.0-xdvi-keepflag.patch
===================================================================
RCS file: /cvs/extras/rpms/tetex/F-7/tetex-3.0-xdvi-keepflag.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tetex-3.0-xdvi-keepflag.patch 4 Nov 2005 14:52:58 -0000 1.2
+++ tetex-3.0-xdvi-keepflag.patch 20 Jan 2008 10:17:57 -0000 1.3
@@ -1,5 +1,24 @@
---- tetex-src-3.0/texk/xdvik/events.c.xdvi-keepflag 2004-11-29 17:45:11.000000000 -0700
-+++ tetex-src-3.0/texk/xdvik/events.c 2005-11-02 17:02:19.000000000 -0700
+diff -up tetex-src-3.0/texk/xdvik/xdvi.1.in.keepflag tetex-src-3.0/texk/xdvik/xdvi.1.in
+--- tetex-src-3.0/texk/xdvik/xdvi.1.in.keepflag 2008-01-20 10:42:20.000000000 +0100
++++ tetex-src-3.0/texk/xdvik/xdvi.1.in 2008-01-20 10:45:13.000000000 +0100
+@@ -867,6 +867,14 @@
+ .B up-or-previous()
+ and
+ .BR down-or-next() .
++(Note: this version of the program is modified to honour this
++flag for
++.B up-or-previous()
++and
++.BR down-or-next()
++although only for a horizontal position and not vertical. That allows
++for a "continuous" scrolling back an forth through a document with
++a display window narrower than a page width.)
+ .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+ .TP
+ .B \-l
+diff -up tetex-src-3.0/texk/xdvik/events.c.keepflag tetex-src-3.0/texk/xdvik/events.c
+--- tetex-src-3.0/texk/xdvik/events.c.keepflag 2004-11-30 01:45:11.000000000 +0100
++++ tetex-src-3.0/texk/xdvik/events.c 2008-01-20 10:45:13.000000000 +0100
@@ -696,10 +696,12 @@ home(wide_bool scrl)
{
int value;
@@ -17,7 +36,16 @@
value = (globals.page.h - mane.height) / 2;
if (value > resource.topmargin_int / mane.shrinkfactor)
-@@ -745,10 +747,12 @@ home_bottom(wide_bool scrl)
+@@ -708,7 +710,7 @@ home(wide_bool scrl)
+ }
+ # else
+ get_xy();
+- if (globals.widgets.x_bar != NULL) {
++ if (!resource.keep_flag && globals.widgets.x_bar != NULL) {
+ int coord = (globals.page.w - mane.width) / 2;
+
+ if (coord > resource.sidemargin_int / mane.shrinkfactor)
+@@ -745,16 +747,18 @@ home_bottom(wide_bool scrl)
{
int value;
@@ -34,3 +62,10 @@
(void)set_bar_value(globals.widgets.y_bar, (int)(globals.page.h - mane.height), (int)(globals.page.h - mane.height));
}
+ #else /* MOTIF */
+ get_xy();
+- if (globals.widgets.x_bar != NULL) {
++ if (!resource.keep_flag && globals.widgets.x_bar != NULL) {
+ int coord = (globals.page.w - mane.width) / 2;
+
+ if (coord > resource.sidemargin_int / mane.shrinkfactor)
Index: tetex.spec
===================================================================
RCS file: /cvs/extras/rpms/tetex/F-7/tetex.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- tetex.spec 30 Nov 2007 14:11:05 -0000 1.115
+++ tetex.spec 20 Jan 2008 10:17:57 -0000 1.116
@@ -11,7 +11,7 @@
Summary: The TeX text formatting system.
Name: tetex
Version: 3.0
-Release: 40.4%{?dist}
+Release: 40.5{?dist}
License: Public Domain and GPLv2 and MIT and LPPL and Utopia and Artistic 2.0
Group: Applications/Publishing
Requires: tmpwatch, dialog, ed
@@ -29,6 +29,9 @@
Source99: tetex-filter-requires.sh
%define __perl_requires %{SOURCE99}
+# Temporarily disable check-buildroot
+%define __arch_install_post %{nil}
+
#####
# Source100-200: teTeX extension styles
#####
@@ -171,7 +174,7 @@
Requires: tetex-dvips = %{version}
PreReq: desktop-file-utils >= %{desktop_file_utils_version}
%if %{enable_japanese}
-Obsoletes: xdvik
+Obsoletes: xdvik < 22.84.10
#Requires: fonts-japanese >= 0.20050222-11.1
%endif
@@ -296,7 +299,7 @@
%patch13 -p1 -b .rightarrow
# Fix usage of uninitialized variable (bug #149212)
%patch14 -p1 -b .dcb314
-# Fix xdvi - navigation with a spacebar does not keep position (bug #168124)
+# Fix xdvi - navigation with a spacebar does not keep position (bug #168124, #417461)
%patch15 -p1 -b .xdvi-keepflag
# Fix obsolete option passed to sort in texconfig (#172337)
%patch16 -p1 -b .texconfig-sortfix
@@ -764,6 +767,10 @@
head -n 1 ${RPM_BUILD_ROOT}/usr/share/texmf/ls-R > \
${RPM_BUILD_ROOT}/var/lib/texmf/ls-R
+# remove references to buildroot:
+find ${RPM_BUILD_ROOT} -type f -name "*.map" \
+| xargs sed -i "s@${RPM_BUILD_ROOT}@@g"
+
%clean
rm -rf ${RPM_BUILD_ROOT}
rm -f filelist.*
@@ -772,6 +779,7 @@
%post
[ -x %{_bindir}/texhash ] && /usr/bin/env - %{_bindir}/texhash 2> /dev/null
+[ -x /sbin/restorecon ] && /sbin/restorecon -R /usr/share/texmf/ 2> /dev/null
exit 0
%post latex
@@ -797,14 +805,17 @@
/sbin/install-info %{_infodir}/web2c.info.gz %{_infodir}/dir
[ -x %{_bindir}/texhash ] && /usr/bin/env - %{_bindir}/texhash 2> /dev/null
[ -x /sbin/restorecon ] && /sbin/restorecon -R /usr/share/texmf/ 2> /dev/null
+[ -x /sbin/restorecon ] && /sbin/restorecon -R /var/lib/texmf/ 2> /dev/null
exit 0
%post afm
[ -x %{_bindir}/texhash ] && /usr/bin/env - %{_bindir}/texhash 2> /dev/null
+[ -x /sbin/restorecon ] && /sbin/restorecon -R /usr/share/texmf/ 2> /dev/null
exit 0
%post doc
[ -x %{_bindir}/texhash ] && /usr/bin/env - %{_bindir}/texhash 2> /dev/null
+[ -x /sbin/restorecon ] && /sbin/restorecon -R /usr/share/texmf/ 2> /dev/null
exit 0
%postun
@@ -883,6 +894,16 @@
%defattr(-,root,root)
%changelog
+* Sun Jan 20 2008 Jindrich Novy <jnovy at redhat.com> 3.0-40.5
+- fix navigation with a spacebar in xdvi (#417461)
+- run restorecon also for /var/lib/texmf/ to have correct selinux
+ labels (#427066)
+- temporarily disable check-buildroot so that we don't get
+ broken fmt files after buildroot references removal (#325311)
+- obsolete only old xdvik version in order to not to clash wih
+ newer xdvik, which is packaged separately
+- remove old tarball added accidentially to CVS in history
+
* Fri Nov 30 2007 Jindrich Novy <jnovy at redhat.com> 3.0-40.4
- fix nasty bug in epstopdf (#241794)
--- ptex-src-3.1.8.1.tar.bz2 DELETED ---
More information about the fedora-extras-commits
mailing list