rpms/lyx/FC-6 .cvsignore, 1.17, 1.18 lyx.spec, 1.50, 1.51 lyxrc.dist, 1.1, 1.2 sources, 1.16, 1.17 lyx-qt.desktop, 1.3, NONE lyx-xforms.desktop, 1.3, NONE lyx.conf, 1.1, NONE lyx.sh, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Sat Aug 18 22:44:28 UTC 2007
- Previous message: rpms/qof/devel .cvsignore, 1.5, 1.6 qof.spec, 1.18, 1.19 sources, 1.5, 1.6
- Next message: rpms/lyx/FC-6 lyx-1.5.0rc2-xdg-open.patch, NONE, 1.1 lyx.spec, 1.51, 1.52 lyx-1.4.4-xdg_open.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/lyx/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13762
Modified Files:
.cvsignore lyx.spec lyxrc.dist sources
Removed Files:
lyx-qt.desktop lyx-xforms.desktop lyx.conf lyx.sh
Log Message:
* Thu Aug 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.1-1
- lyx-1.5.1
- License: GPLv2+
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/FC-6/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 27 Jul 2007 15:11:47 -0000 1.17
+++ .cvsignore 18 Aug 2007 22:43:49 -0000 1.18
@@ -1,5 +1,4 @@
clog
beamer.layout
-lyx-1.4.3.tar.bz2
-lyx-1.4.4.tar.bz2
-lyx-1.4.5.1.tar.bz2
+lyx-1.5.0.tar.bz2
+lyx-1.5.1.tar.bz2
Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/FC-6/lyx.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- lyx.spec 27 Jul 2007 15:11:47 -0000 1.50
+++ lyx.spec 18 Aug 2007 22:43:49 -0000 1.51
@@ -1,30 +1,23 @@
Summary: WYSIWYM (What You See Is What You Mean) document processor
Name: lyx
-Version: 1.4.5.1
+Version: 1.5.1
Release: 1%{?dist}
-License: GPL
+License: GPLv2+
Group: Applications/Publishing
Url: http://www.lyx.org/
-Source0: ftp://ftp.devel.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
+Source0: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: lyx-1.4.4-xdg_open.patch
+Patch1: lyx-1.5.0rc2-xdg-open.patch
Source1: lyxrc.dist
-# app-wrapper for various frontends
-Source10: lyx.sh
-# .desktop files
-Source20: lyx.desktop
-Source21: lyx-qt.desktop
-Source22: lyx-xforms.desktop
-
-# qt frontend
-BuildRequires: qt-devel
-# xforms frontend
-BuildRequires: xforms-devel
+Source10: lyx.desktop
+
+BuildRequires: qt4-devel
+#BuildRequires: boost-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: python
@@ -34,22 +27,25 @@
BuildRequires: tetex-latex
BuildRequires: tetex-fonts
+Obsoletes: %{name}-qt < %{version}-%{release}
+Provides: %{name}-qt = %{version}-%{release}
+Obsoletes: %{name}-xforms < %{version}
+
# For texhash
Requires(post): tetex-fonts
Requires(postun): tetex-fonts
-Requires: %{name}-frontend = %{version}
Requires: tetex-latex
Requires: tetex-dvips
Requires: mathml-fonts
Requires: ghostscript
-# Short-hand for Requires+Requires(post,postun)
-Prereq: xdg-utils
## Soft dependencies
+Requires(hint): xdg-utils
%if 0%{?fedora} > 3
-# dvipost adds support for lyx's Document->Change Tracking feature
+# Document->Change Tracking feature
Requires(hint): tetex-dvipost
Requires(hint): tetex-preview
+Requires(hint): tetex-IEEEtran
%endif
# convert doc files to lyx (bug #193858)
Requires(hint): wv
@@ -72,45 +68,18 @@
and let the computer take care of the rest.
-%package qt
-Summary: Lyx graphical frontend using Qt
-Group: Applications/Publishing
-Requires: %{name} = %{version}
-Provides: %{name}-frontend = %{version}-%{release}
-%description qt
-%{summary}.
-
-%package xforms
-Summary: Lyx graphical frontend using XForms
-Group: Applications/Publishing
-Requires: %{name} = %{version}
-Provides: %{name}-frontend = %{version}-%{release}
-%description xforms
-%{summary}.
-Please note: This frontend is deprecated, and will no longer be included
-in lyx-1.5.x.
-
%prep
-%setup -q -n %{name}-%{version}%{?beta}
+%setup -q -n %{name}-%{version}%{?pre}
-%patch1 -p1 -b .xdg_open
+%patch1 -p1 -b .xdg-open
%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-
-# drop -fexceptions from optflags, suggested by lyx devs:
-# http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg85794.html
-optflags="$(echo %optflags | sed -e 's|-fexceptions||' )"
-%global optflags $optflags
-
%configure \
--disable-rpath \
- --enable-compression-support \
- --with-frontend="qt xforms" \
--enable-optimization="%{optflags}" \
--with-aiksaurus \
--with-aspell \
@@ -125,11 +94,6 @@
make install DESTDIR=$RPM_BUILD_ROOT
-## Handle front-ends
-install -p -m0755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/lyx
-install -p -m0755 -D src/lyx-qt $RPM_BUILD_ROOT%{_bindir}/lyx-qt
-install -p -m0755 -D src/lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms
-
# misc/extras
install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/lyx/lyxrc.dist
@@ -143,16 +107,12 @@
desktop-file-install \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--vendor="" \
- %{SOURCE21} %{SOURCE22}
+ %{SOURCE10}
# generic/hicolor icon
install -p -D -m644 lib/images/lyx.xpm \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/lyx.xpm
-# configure renamed to configure.py recently, make symlink to
-# old location
-ln -s configure.py $RPM_BUILD_ROOT%{_datadir}/lyx/configure
-
# ghost'd files
touch $RPM_BUILD_ROOT%{_datadir}/lyx/lyxrc.defaults
touch $RPM_BUILD_ROOT%{_datadir}/lyx/{packages,textclass}.lst
@@ -161,16 +121,22 @@
%find_lang %{name}
-%post
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+# experimental scriptlet optimization
+# %postun still required until either %posttrans runs on uninstall
+# or postuntrans exists. -- Rex
+%posttrans
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
texhash > /dev/null 2>&1 ||:
-cd %{_datadir}/lyx && ./configure.py > /dev/null 2>&1 ||:
%postun
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ]; then
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
texhash > /dev/null 2>&1 ||:
+fi
## Catch installed/uninstalled helpers
## not sure if this is really needed anymore, as it seems to be a per-user thing,
@@ -193,10 +159,9 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc ANNOUNCE ChangeLog lib/CREDITS NEWS README
-%{_bindir}/lyx
-%{_bindir}/lyxclient
-%{_bindir}/tex2lyx
+%{_bindir}/*
%{_mandir}/man1/*
+%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/lyx/
%config(noreplace) %{_datadir}/lyx/lyxrc.dist
@@ -205,20 +170,45 @@
%ghost %{_datadir}/lyx/doc/LaTeXConfig.lyx
%{_datadir}/texmf/tex/latex/lyx/
-%files qt
-%defattr(-,root,root,-)
-%{_bindir}/lyx-qt
-%{_datadir}/applications/*lyx-qt.desktop
-%files xforms
-%defattr(-,root,root,-)
-%{_bindir}/lyx-xforms
-%{_datadir}/applications/*lyx-xforms.desktop
+%changelog
+* Thu Aug 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.1-1
+- lyx-1.5.1
+- License: GPLv2+
+* Wed Jul 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-1
+- lyx-1.5.0(final)
-%changelog
-* Fri Jul 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.5.1-1
-- lyx-1.4.5.1
+* Sun Jul 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.10.rc2
+- upstream patch for 'lyx --export latex' crasher (#248282)
+
+* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.9.rc2
+- scriptlet optmization
+
+* Thu Jun 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.8.rc2
+- lyx-1.5.0rc2
+
+* Fri Jun 01 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.7.rc1
+- lyx-1.5.0rc1
+
+* Fri May 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.6.beta3
+- lyx-1.5.0beta3
+
+* Sun Apr 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.5.beta2
+- lyx-1.5.0beta2
+
+* Mon Apr 02 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.4.beta1
+- fix qt-4.3 crasher
+
+* Tue Mar 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.3.beta1
+- stop omitting -fexceptions
+
+* Wed Mar 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.2.beta1
+- +Requires: tetex-IEEEtran (#232840)
+
+* Mon Mar 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.5.0-0.1.beta1
+- lyx-1.5.0beta1
+- tweak lyxrc.dist
* Thu Feb 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.4.4-2
- biffed sources, respin
Index: lyxrc.dist
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/FC-6/lyxrc.dist,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lyxrc.dist 25 Jul 2006 18:08:01 -0000 1.1
+++ lyxrc.dist 18 Aug 2007 22:43:49 -0000 1.2
@@ -170,7 +170,7 @@
# The screen fonts used to display the text while editing
# The defaults are:
\screen_font_roman "Serif"
-\screen_font_sans "Sans"
+\screen_font_sans "Sans Serif"
\screen_font_typewriter "Monospace"
# For some, this font looks better:
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/FC-6/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 27 Jul 2007 15:11:47 -0000 1.16
+++ sources 18 Aug 2007 22:43:49 -0000 1.17
@@ -1 +1 @@
-b74d82e80c49c7edb782ec7395b7ca27 lyx-1.4.5.1.tar.bz2
+0ae3b9ccb2aa74776be4af8c199dbbe9 lyx-1.5.1.tar.bz2
--- lyx-qt.desktop DELETED ---
--- lyx-xforms.desktop DELETED ---
--- lyx.conf DELETED ---
--- lyx.sh DELETED ---
- Previous message: rpms/qof/devel .cvsignore, 1.5, 1.6 qof.spec, 1.18, 1.19 sources, 1.5, 1.6
- Next message: rpms/lyx/FC-6 lyx-1.5.0rc2-xdg-open.patch, NONE, 1.1 lyx.spec, 1.51, 1.52 lyx-1.4.4-xdg_open.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list