Changeset from: mschwendt
Update of /cvs/extras/rpms/lyx/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv9096
Modified Files:
lyx.desktop lyx.spec sources
Added Files:
lyx-1.3.5-helpers.patch lyx-crystal.png
Removed Files:
lyx.png
Log Message:
Sync with lyx-1.3.5-0.fdr.3.2.src.rpm
lyx-1.3.5-helpers.patch:
--- NEW FILE lyx-1.3.5-helpers.patch ---
--- lyx-1.3.5/lib/configure.fix 2004-10-06 09:43:24.000000000 -0500
+++ lyx-1.3.5/lib/configure 2004-10-20 13:49:42.000000000 -0500
@@ -463,9 +463,9 @@
# Search something to preview postscript
echo $ac_n "checking for a Postscript previewer""... $ac_c"
-echo "$ac_t""(gsview32 gv ghostview)"
+echo "$ac_t""(gsview32 gsview ggv kghostview gv ghostview)"
GHOSTVIEW=
-for ac_prog in gsview32 gv ghostview
+for ac_prog in gsview32 gsview ggv kghostview gv ghostview
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog ; ac_word=$2
@@ -504,9 +504,9 @@
# Search for a program to preview pdf
echo $ac_n "checking for a PDF preview""... $ac_c"
-echo "$ac_t""(acrobat acrord32 gsview32 acroread gv ghostview xpdf)"
+echo "$ac_t""(acrobat acrord32 gsview32 gsview acroread xpdf ggv
kghostview gv ghostview)"
PDF_VIEWER=
-for ac_prog in acrobat acrord32 gsview32 acroread gv ghostview xpdf
+for ac_prog in acrobat acrord32 gsview32 gsview acroread xpdf ggv kghostview gv
ghostview
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog ; ac_word=$2
@@ -540,9 +540,9 @@
# Search something to preview dvi
echo $ac_n "checking for a DVI previewer""... $ac_c"
-echo "$ac_t""(xdvi windvi yap)"
+echo "$ac_t""(xdvi kdvi windvi yap)"
DVI_VIEWER=
-for ac_prog in xdvi windvi yap
+for ac_prog in xdvi kdvi windvi yap
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog ; ac_word=$2
@@ -576,9 +576,9 @@
# Search something to preview html
echo $ac_n "checking for a HTML previewer""... $ac_c"
-echo "$ac_t""("mozilla file://\$\$p\$\$i" netscape)"
+echo "$ac_t""("htmlview file://\$\$p\$\$i" "mozilla
file://\$\$p\$\$i" netscape)"
HTML_VIEWER=
-for ac_prog in "mozilla file://\$\$p\$\$i" netscape
+for ac_prog in ""htmlview file://\$\$p\$\$i" mozilla
file://\$\$p\$\$i" netscape
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog ; ac_word=$2
Index: lyx.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyx.desktop 8 Nov 2004 04:51:01 -0000 1.1
+++ lyx.desktop 4 Dec 2004 12:21:23 -0000 1.2
@@ -1,5 +1,6 @@
[Desktop Entry]
Name=LyX
+GenericName=WYSIWYM document processor
Comment=WYSIWYM document processor
Exec=lyx
Icon=lyx.png
Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lyx.spec 11 Nov 2004 13:13:36 -0000 1.4
+++ lyx.spec 4 Dec 2004 12:21:23 -0000 1.5
@@ -1,28 +1,31 @@
# $Id$
-## handy macros
-%{!?_applnkdir:%define _applnkdir %{_sysconfdir}/X11/applnk}
-%{!?_icondir:%define _icondir %{_datadir}/pixmaps}
-
Summary: WYSIWYM (What You See Is What You Mean) document processor
Name: lyx
-Version: 1.3.4
-Release: 7
-License: GPL (see
http://www.lyx.org/about/license.php3)
+Epoch: 0
+Version: 1.3.5
+Release: 3%{?dist_tag}
+License: GPL
Group: Applications/Publishing
Url:
http://www.lyx.org/
-Source:
ftp://ftp.lyx.org/pub/lyx/stable/%{name}-%{version}.tar.bz2
-Patch: lyx-1.3.4-gcc34.patch
+Source:
ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.5.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Patch1: lyx-1.3.5-helpers.patch
+
Source1: lyx.desktop
-Source2: lyx.png
+# "borrow" kde's crystal icon for lyx
+Source2: lyx-crystal.png
BuildRequires: desktop-file-utils
-BuildRequires: pspell-devel
-# for convert (xpm -> png)
-BuildRequires: ImageMagick
-BuildRequires: libtool
+BuildRequires: aspell-devel
+BuildRequires: tetex-latex
+BuildRequires: tetex-fonts
+BuildRequires: tetex-xdvi
+BuildRequires: tetex-dvips
+BuildRequires: htmlview
+BuildRequires: gsview
+BuildRequires: wv
# For texhash
Requires(post): tetex
@@ -30,17 +33,18 @@
Requires: tetex-latex
Requires: mathml-fonts
+# These are just helper apps, to display ps,pdf,html content
+# not *strictly* required, but what the heck
+Requires: htmlview
+Requires: gsview
BuildRequires: qt-devel >= 1:3.1
%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f1,2)
Requires: qt >= 1:%{qt_ver}
-# to workaround missing Requires in redhat's default qt-devel
-# and to make fedora's buildsystem happy
-BuildRequires: XFree86-devel
-BuildRequires: libpng-devel zlib-devel libjpeg-devel
-
## gcc version in use?
+# I *still* build for some rh73 boxes (not sure why (-: ),
+# so I need this -- Rex
BuildRequires: gcc-c++
%define gcc_ver %(rpm -q --qf '%%{version}' gcc-c++ )
%if "%{gcc_ver}" == "2.96"
@@ -69,7 +73,8 @@
%prep
%setup -q
-%patch -p1 -b .gcc34
+
+%patch1 -p1 -b .helpers
%build
@@ -96,23 +101,19 @@
#
# Set up the lyx-specific class files where TeX can see them
#
-TEXMF=%{_datadir}/texmf
-mkdir -p ${RPM_BUILD_ROOT}${TEXMF}/tex/latex
+texmf=%{_datadir}/texmf
+mkdir -p ${RPM_BUILD_ROOT}${texmf}/tex/latex
mv ${RPM_BUILD_ROOT}%{_datadir}/lyx/tex \
- ${RPM_BUILD_ROOT}/${TEXMF}/tex/latex/lyx
+ ${RPM_BUILD_ROOT}${texmf}/tex/latex/lyx
-# KDE has a buildin crystalsvg icon, but this is for gnome
-install -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_icondir}/lyx.png
+# KDE has a nice builtin crystalsvg icon, but this is for gnome
+install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png
-%if "%{?desktop_file}" != "0"
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category "X-Fedora" \
%{SOURCE1}
-%else
-install -p -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Applications/%{name}.desktop
-%endif
%find_lang %{name}
@@ -136,11 +137,7 @@
%files -f %{name}.lang
%defattr(-,root,root)
%doc ANNOUNCE ChangeLog lib/CREDITS NEWS README
-%if "%{?desktop_file}" != "0"
%{_datadir}/applications/*.desktop
-%else
-%{_applnkdir}/*/*.desktop
-%endif
%{_datadir}/pixmaps/*
%{_bindir}/*
%{_mandir}/man?/*
@@ -148,9 +145,20 @@
%{_datadir}/texmf/tex/latex/%{name}
-%changelog
-* Thu Nov 11 2004 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.3.4-7
-- Fix build for FC3/GCC 3.4.
+%changelog
+* Thu Oct 21 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-3
+- BR: htmlview
+- Requires: htmlview, gsview (so build-time-detected helper apps are
+ available at runtime)
+
+* Wed Oct 20 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-0.fdr.2
+- BR: pspell-devel -> aspell-devel
+- BR: tetex-* (helper detection, fonts)
+- -helpers patch: find/use htmlview, gsview, kdvi, ggv, kghostview
+- .desktop: GenericName: WYSIWYM document processor
+
+* Wed Oct 06 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.5-0.fdr.1
+- 1.3.5
* Fri Apr 30 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.6
- BR: libtool
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:51:01 -0000 1.2
+++ sources 4 Dec 2004 12:21:23 -0000 1.3
@@ -1 +1 @@
-13fe7a7bcec0430e9a9436f2e3cfa04e lyx-1.3.4.tar.bz2
+f4c70d2565ba9c974b1f94fc1dfd63bf lyx-1.3.5.tar.bz2