rpms/lyx/devel lyx.spec,1.97,1.98

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/lyx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5515

Modified Files:
	lyx.spec 
Log Message:
* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.3-3
- add lyx-*-fonts subpkgs (#452357, #514549)
- -common (noarch) subpkg
- trim %changelog



Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- lyx.spec	25 Jul 2009 11:33:53 -0000	1.97
+++ lyx.spec	3 Aug 2009 17:23:58 -0000	1.98
@@ -2,12 +2,24 @@
 %if 0%{?fedora} > 3
 %define _with_aiksaurus --with-aiksaurus
 %endif
+
+## lyx-fonts
+%global fontname lyx
+%global common_desc \
+A collection of Math symbol fonts.
+%if 0%{?fedora} > 8
+%define fontpackages 1
+BuildRequires: fontpackages-devel
+%else
+## FIXME!!
+%endif
+
 %define _without_included_boost --without-included-boost
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.6.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+
 Group: 	 Applications/Publishing
@@ -42,6 +54,18 @@ Obsoletes: %{name}-qt < 1.5.0 
 Provides:  %{name}-qt = %{version}-%{release}
 Obsoletes: %{name}-xforms < 1.5.0 
 
+Requires: %{name}-common = %{version}-%{release}
+
+Requires: %{fontname}-cmex10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmmi10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmr10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmsy10-fonts = %{version}-%{release}
+Requires: %{fontname}-esint10-fonts = %{version}-%{release}
+Requires: %{fontname}-eufm10-fonts = %{version}-%{release}
+Requires: %{fontname}-msam10-fonts = %{version}-%{release}
+Requires: %{fontname}-msbm10-fonts = %{version}-%{release}
+Requires: %{fontname}-wasy10-fonts = %{version}-%{release}
+
 %if 0%{?fedora} > 8
 BuildRequires: tex(dvips) tex(latex) texlive-fonts
 Requires(post): texlive
@@ -55,7 +79,6 @@ Requires(post): tetex-fonts
 Requires(postun): tetex-fonts
 Requires: tetex-dvips tetex-latex
 %endif
-Requires: mathml-fonts
 Requires: ghostscript
 ## Soft dependencies
 %if 0%{?fedora} > 3 && 0%{?fedora} < 9
@@ -63,9 +86,9 @@ Requires: ghostscript
 Requires(hint): tetex-dvipost
 Requires(hint): tetex-preview
 Requires(hint): tetex-IEEEtran
+%endif
 # convert doc files to lyx (bug #193858)
 Requires(hint): wv
-%endif
 Requires(hint): xdg-utils
 
 %description
@@ -85,6 +108,149 @@ to the backends (like LaTeX) that are sp
 With LyX, the author can concentrate on the contents of his writing,
 and let the computer take care of the rest.
 
+%package common
+Summary:  Common files of %{name} 
+Requires: %{name} = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description common 
+{summary}.
+
+%package -n %{fontname}-fonts-compat
+Summary: Lyx/MathML fonts compatibility package
+License: Copyright only and GPL+
+Obsoletes: mathml-fonts < 1.0-50
+Provides:  mathml-fonts = 1.0-50
+Provides: %{fontname}-fonts = %{version}-%{release}
+Requires: %{fontname}-cmex10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmmi10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmr10-fonts = %{version}-%{release}
+Requires: %{fontname}-cmsy10-fonts = %{version}-%{release}
+Requires: %{fontname}-esint10-fonts = %{version}-%{release}
+Requires: %{fontname}-eufm10-fonts = %{version}-%{release}
+Requires: %{fontname}-msam10-fonts = %{version}-%{release}
+Requires: %{fontname}-msbm10-fonts = %{version}-%{release}
+Requires: %{fontname}-wasy10-fonts = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{fontname}-fonts-compat
+This package only exists to help transition mathml-fonts users to the new
+package split. It will be removed after one distribution release cycle, please
+do not reference it or depend on it in any way.
+
+%package -n %{fontname}-fonts-common
+Summary: Common files of %{fontname}-fonts
+# The actual license says "The author of these fonts, Basil K. Malyshev, has
+# kindly granted permission to use and modify these fonts."
+# One of the font files (wasy10) is separately licensed GPL+.
+License: Copyright only and GPL+
+%{?fontpackages:Requires: fontpackages-filesystem}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{name}-fonts-common
+This package consists of files used by other %{fontname}-fonts packages.
+
+%package -n %{fontname}-cmex10-fonts
+Summary: Cmex10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{fontname}-cmex10-fonts
+%common_desc
+%{?_font_pkg:%_font_pkg -n cmex10 cmex10.ttf}
+
+%package -n %{fontname}-cmmi10-fonts
+Summary: Cmmi10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{fontname}-cmmi10-fonts
+%common_desc
+%{?_font_pkg:%_font_pkg -n cmmi10 cmmi10.ttf}
+
+%package -n %{fontname}-cmr10-fonts
+Summary: Cmr10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{fontname}-cmr10-fonts
+%common_desc
+%{?_font_pkg:%_font_pkg -n cmr10 cmr10.ttf}
+
+%package -n %{fontname}-cmsy10-fonts
+Summary: Cmsy10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{fontname}-cmsy10-fonts
+%common_desc
+%{?_font_pkg:%_font_pkg -n cmsy10 cmsy10.ttf}
+
+%package -n %{fontname}-esint10-fonts
+Summary: Esint10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{fontname}-esint10-fonts
+%common_desc
+%{?_font_pkg:%_font_pkg -n esint10 esint10.ttf}
+
+%package -n %{fontname}-eufm10-fonts
+Summary: Eufm10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{fontname}-eufm10-fonts
+%common_desc
+%{?_font_pkg:%_font_pkg -n eufm10 eufm10.ttf}
+
+%package -n %{fontname}-msam10-fonts
+Summary: Msam10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{fontname}-msam10-fonts
+%common_desc
+%{?_font_pkg:%_font_pkg -n msam10 msam10.ttf}
+
+%package -n %{fontname}-msbm10-fonts
+Summary: Msbm10 fonts
+License: Copyright only
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{fontname}-msbm10-fonts
+%common_desc
+%{?_font_pkg:%_font_pkg -n msbm10 msbm10.ttf}
+
+%package -n %{fontname}-wasy10-fonts
+Summary: Wasy10 fonts
+License: GPL+
+Requires: %{fontname}-fonts-common = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description -n %{fontname}-wasy10-fonts
+%common_desc
+%{?_font_pkg:%_font_pkg -n wasy10 wasy10.ttf}
 
 
 %prep
@@ -137,7 +303,9 @@ touch %{buildroot}%{_datadir}/lyx/lyxrc.
 touch %{buildroot}%{_datadir}/lyx/{packages,textclass}.lst
 touch %{buildroot}%{_datadir}/lyx/doc/LaTeXConfig.lyx
 
-# unpackaged files
+# fonts
+install -m 0755 -d %{buildroot}%{_fontdir}
+mv %{buildroot}%{_datadir}/lyx/fonts/*.ttf %{buildroot}%{_fontdir}/
 rm -rf %{buildroot}%{_datadir}/lyx/fonts
 
 %find_lang %{name}
@@ -147,10 +315,10 @@ rm -rf %{buildroot}%{_datadir}/lyx/fonts
 make check
 
 
-%post
+%post common
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
-%postun
+%postun common
 if [ $1 -eq 0 ] ; then
   texhash >& /dev/null 
   update-desktop-database -q &> /dev/null
@@ -158,7 +326,7 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
-%posttrans
+%posttrans common
 texhash >& /dev/null
 update-desktop-database -q &> /dev/null
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
@@ -166,12 +334,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 ## Catch installed/uninstalled helpers
 ##   not sure if this is really needed anymore, as it seems to be a per-user thing,
 ##   and besides, we use xdg-open now -- Rex
-%triggerin -- latex2html,wv
+%triggerin common -- latex2html,wv
 if [ $2 -gt 1 ]; then
 cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||:
 fi
 
-%triggerun -- latex2html,wv
+%triggerun common -- latex2html,wv
 if [ $2 -eq 0 ]; then
 cd %{_datadir}/lyx && ./configure.py --without-latex-config > /dev/null 2>&1 ||:
 fi
@@ -181,10 +349,13 @@ fi
 rm -rf %{buildroot}
 
 
-%files -f %{name}.lang
+%files 
 %defattr(-,root,root,-)
-%doc ANNOUNCE lib/CREDITS NEWS README
+%doc ANNOUNCE COPYING lib/CREDITS NEWS README
 %{_bindir}/*
+
+%files common -f %{name}.lang
+%defattr(-,root,root,-)
 %{_mandir}/man1/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
@@ -195,8 +366,21 @@ rm -rf %{buildroot}
 %ghost %{_datadir}/lyx/doc/LaTeXConfig.lyx
 %{_datadir}/texmf/tex/latex/lyx/
 
+%files -n %{fontname}-fonts-compat
+# boo!
+
+%files -n %{fontname}-fonts-common
+%defattr(0644,root,root,0755)
+%doc lib/fonts/BaKoMaFontLicense.txt
+%doc lib/fonts/ReadmeBaKoMa4LyX.txt
+
 
 %changelog
+* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.6.3-3
+- add lyx-*-fonts subpkgs (#452357, #514549)
+- -common (noarch) subpkg
+- trim %%changelog
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -398,151 +582,3 @@ rm -rf %{buildroot}
 * Wed Mar 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-2
 - 1.4.0(final)
 - drop boost bits
-
-* Tue Mar 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.12.rc
-- 1.4.0rc
-- drop boost patch (for now)
-
-* Fri Mar 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.11.pre6
-- 1.4.0pre6
-- --disable-stdlib-debug --disable-assertions --disable-concept-checks
-- don't use --without-included-boost (for now)
-
-* Mon Feb 20 2006 Rex Dieter <rexdieter[AT]usres.sf.net> 1.4.0-0.10.pre5
-- gcc41 patch
-- document boost/gcc41 patches
-- avoid --without-included-boost on fc4/gcc-4.0.2 (gcc bug)
-
-* Tue Feb 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.9.pre5
-- updated boost patch
-- drop -fexceptions from %%optflags
-
-* Mon Feb 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.7.pre5
-- --without-included-boost
-- BR: boost-devel
-
-* Mon Feb 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.5.pre5
-- 1.4.0pre5
-
-* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.2.pre4
-- 1.4.0pre4
-
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.1.pre3
-- 1.4.0pre3
-
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-4
-- cleanup/fix snarfing of intermediate frontend builds.
-
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2
-- BR: libXpm-devel
-
-* Tue Jan 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-1
-- 1.3.7
-- -qt/-xforms: frontend pkgs (#178116)
-
-* Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-5
-- %%post/%%postun: update-desktop-database
-
-* Fri Sep 02 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-4
-- leave out kde-redhat bits in Fedora Extras build
-- define/use safer (esp for x86_64) QTDIR bits
-
-* Fri Aug 05 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-3
-- touchup helpers script
-- fix for (sometimes missing) PSres.upr
-
-* Mon Aug 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-2
-- use triggers to configure/unconfigure helper (ps/pdf/html) apps
-
-* Sat Jul 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-1
-- 1.3.6
-
-* Mon May 23 2005 Rex Dieter <rexdieter[At]users.sf.net> 1.3.5-4
-- qt_immodule patch (lyx bug #1830)
-- update -helpers patch to look-for/use evince (rh bug #143992)
-- drop (not-strictly-required) Req's on helper apps
-  htmlview, gsview (rh bug #143992)
-- %%configure: --with-aiksaurus
-- %%configure: --enable-optimization="$$RPM_OPT_FLAGS"
-- %%configure: --disable-dependency-tracking
-
-* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.3.5
-- rebuild on all arches
-
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
-
-* 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)
-
-* Thu Oct 21 2004 Rex Dieter <rexdieter[At]users.sf.net> 0:1.3.5-0.fdr.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
-
-* Fri Apr 23 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.5
-- Group: Applications/Publishing
-- BR: desktop-file-utils
-- Requires(post,postun): tetex
-
-* Sat Apr 10 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.4
-- .desktop: separate file
-- .desktop: drop 'Utility' category, add 'Qt'
-- .desktop: Name: lyx -> LyX
-- .desktop: Comment: lyx 1.3.4 -> WYSIWYM document processor
-- convert icon xpm -> png
-
-* Thu Mar 11 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.3
-- dynamically determine version for qt dependency.
-
-* Tue Mar 09 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.2
-- add a few (mostly superfluous) BuildRequires to make fedora.us's
-  buildsystem happy.
-
-* Tue Mar 09 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.1
-- Allow building/use for any qt >= 3.1
-
-* Thu Feb 19 2004 Rex Dieter <rexdieter at sf.net> 0:1.3.4-0.fdr.0
-- 1.3.4
-- Categories=Office
-
-* Mon Nov 24 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.3
-- Requires: tetex-latex
-- support MimeType(s): application/x-lyx;text/x-lyx
-
-* Sat Nov 22 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.2
-- let rpm auto-require qt.
-- remove (optional) xforms support.
-- Requires: latex-xft-fonts
-
-* Mon Oct 06 2003 Rex Dieter <rexdieter at sf.net> 0:1.3.3-0.fdr.1
-- 1.3.3
-- update macros for Fedora Core.
-
-* Mon May 12 2003 Rex Dieter <rexdieter at users.sf.net> 0:1.3.2-0.fdr.0
-- 1.3.2
-- fedora-ize.
-
-* Tue Mar 25 2003 Rex Dieter <rexdieter at users.sf.net> 1.3.1-1.0
-- 1.3.1 release.
-
-* Fri Feb 21 2003 Rex Dieter <rexdieter at users.sf.net> 1.3.0-1.0
-- yank kmenu
-
-* Fri Feb 07 2003 Rex Dieter <rexdieter at users.sf.net> 1.3.0-0.0
-- 1.3.0
-