rpms/lyx/devel lyx.spec,1.104,1.105
Rex Dieter
rdieter at fedoraproject.org
Sat Jan 16 20:55:12 UTC 2010
Author: rdieter
Update of /cvs/pkgs/rpms/lyx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6296
Modified Files:
lyx.spec
Log Message:
* Sat Jan 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.6.5-3
- rebiuld (boost)
- use simple font template
Index: lyx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- lyx.spec 9 Dec 2009 23:45:01 -0000 1.104
+++ lyx.spec 16 Jan 2010 20:55:12 -0000 1.105
@@ -9,8 +9,6 @@
## lyx-fonts
%global fontname lyx
-%global common_desc \
-A collection of Math symbol fonts.
#if 0%{?fedora} > 8
%if 0
%define fontpackages 1
@@ -24,7 +22,7 @@ BuildRequires: fontpackages-devel
Summary: WYSIWYM (What You See Is What You Mean) document processor
Name: lyx
Version: 1.6.5
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: Applications/Publishing
@@ -68,15 +66,7 @@ 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}
+Requires: %{fontname}-fonts = %{version}-%{release}
%if 0%{?fedora} > 8
BuildRequires: tex(dvips) tex(latex) texlive-fonts
@@ -128,120 +118,31 @@ Requires: %{name} = %{version}-%{release
%description common
{summary}.
-%package -n %{fontname}-fonts-compat
-Summary: Lyx/MathML fonts compatibility package
-License: Copyright only and GPL+
-Group: Applications/Publishing
-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}
-%{?build_noarch}
-%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
+%package fonts
+Summary: Lyx/MathML fonts
Group: Applications/Publishing
# 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}
+Obsoletes: mathml-fonts < 1.0-50
+Provides: mathml-fonts = 1.0-50
+Obsoletes: lyx-fonts-common < 1.6.5-3
+Obsoletes: lyx-fonts-compat < 1.6.5-3
+Obsoletes: lyx-cmex10-fonts < 1.6.5-3
+Obsoletes: lyx-cmmi10-fonts < 1.6.5-3
+Obsoletes: lyx-cmr10-fonts < 1.6.5-3
+Obsoletes: lyx-cmsy10-fonts < 1.6.5-3
+Obsoletes: lyx-esint10-fonts < 1.6.5-3
+Obsoletes: lyx-eufm10-fonts < 1.6.5-3
+Obsoletes: lyx-msam10-fonts < 1.6.5-3
+Obsoletes: lyx-msbm10-fonts < 1.6.5-3
+Obsoletes: lyx-wasy10-fonts < 1.6.5-3
%{?build_noarch}
-%description -n %{fontname}-fonts-common
-This package consists of files used by other %{fontname}-fonts packages.
-
-%package -n %{fontname}-cmex10-fonts
-Summary: Cmex10 fonts
-Group: Applications/Publishing
-License: Copyright only
-Requires: %{fontname}-fonts-common = %{version}-%{release}
-%{?build_noarch}
-%description -n %{fontname}-cmex10-fonts
-%common_desc
-
-%package -n %{fontname}-cmmi10-fonts
-Summary: Cmmi10 fonts
-Group: Applications/Publishing
-License: Copyright only
-Requires: %{fontname}-fonts-common = %{version}-%{release}
-%{?build_noarch}
-%description -n %{fontname}-cmmi10-fonts
-%common_desc
-
-%package -n %{fontname}-cmr10-fonts
-Summary: Cmr10 fonts
-Group: Applications/Publishing
-License: Copyright only
-Requires: %{fontname}-fonts-common = %{version}-%{release}
-%{?build_noarch}
-%description -n %{fontname}-cmr10-fonts
-%common_desc
-
-%package -n %{fontname}-cmsy10-fonts
-Summary: Cmsy10 fonts
-Group: Applications/Publishing
-License: Copyright only
-Requires: %{fontname}-fonts-common = %{version}-%{release}
-%{?build_noarch}
-%description -n %{fontname}-cmsy10-fonts
-%common_desc
-
-%package -n %{fontname}-esint10-fonts
-Summary: Esint10 fonts
-Group: Applications/Publishing
-License: Copyright only
-Requires: %{fontname}-fonts-common = %{version}-%{release}
-%{?build_noarch}
-%description -n %{fontname}-esint10-fonts
-%common_desc
-
-%package -n %{fontname}-eufm10-fonts
-Summary: Eufm10 fonts
-Group: Applications/Publishing
-License: Copyright only
-Requires: %{fontname}-fonts-common = %{version}-%{release}
-%{?build_noarch}
-%description -n %{fontname}-eufm10-fonts
-%common_desc
-
-%package -n %{fontname}-msam10-fonts
-Summary: Msam10 fonts
-Group: Applications/Publishing
-License: Copyright only
-Requires: %{fontname}-fonts-common = %{version}-%{release}
-%{?build_noarch}
-%description -n %{fontname}-msam10-fonts
-%common_desc
-
-%package -n %{fontname}-msbm10-fonts
-Summary: Msbm10 fonts
-Group: Applications/Publishing
-License: Copyright only
-Requires: %{fontname}-fonts-common = %{version}-%{release}
-%{?build_noarch}
-%description -n %{fontname}-msbm10-fonts
-%common_desc
+%description fonts
+A collection of Math symbol fonts for %{name}.
-%package -n %{fontname}-wasy10-fonts
-Summary: Wasy10 fonts
-Group: Applications/Publishing
-License: GPL+
-Requires: %{fontname}-fonts-common = %{version}-%{release}
-%{?build_noarch}
-%description -n %{fontname}-wasy10-fonts
-%common_desc
%prep
@@ -362,94 +263,27 @@ 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)
+%if 0%{?fontpackages:1}
+%_font_pkg fonts %{_fontdir}/
%doc lib/fonts/BaKoMaFontLicense.txt
%doc lib/fonts/ReadmeBaKoMa4LyX.txt
-%dir %{_fontdir}
-
-%if 0%{?fontpackages:1}
-%_font_pkg -n cmex10 cmex10.ttf
-%_font_pkg -n cmmi10 cmmi10.ttf
-%_font_pkg -n cmr10 cmr10.ttf
-%_font_pkg -n cmsy10 cmsy10.ttf
-%_font_pkg -n esint10 esint10.ttf
-%_font_pkg -n eufm10 eufm10.ttf
-%_font_pkg -n msam10 msam10.ttf
-%_font_pkg -n msbm10 msbm10.ttf
-%_font_pkg -n wasy10 wasy10.ttf
%else
-
-%files -n %{fontname}-cmex10-fonts
-%defattr(-,root,root,-)
-%{_fontdir}/cmex10.ttf
-
-%posttrans -n %{fontname}-cmex10-fonts
-fc-cache %{_fontdir} 2> /dev/null ||:
-
-%files -n %{fontname}-cmmi10-fonts
+%files fonts
%defattr(-,root,root,-)
-%{_fontdir}/cmmi10.ttf
-
-%posttrans -n %{fontname}-cmmi10-fonts
-fc-cache %{_fontdir} 2> /dev/null ||:
-
-%files -n %{fontname}-cmr10-fonts
-%defattr(-,root,root,-)
-%{_fontdir}/cmr10.ttf
-
-%posttrans -n %{fontname}-cmr10-fonts
-fc-cache %{_fontdir} 2> /dev/null ||:
-
-%files -n %{fontname}-cmsy10-fonts
-%defattr(-,root,root,-)
-%{_fontdir}/cmsy10.ttf
-
-%posttrans -n %{fontname}-cmsy10-fonts
-fc-cache %{_fontdir} 2> /dev/null ||:
-
-%files -n %{fontname}-esint10-fonts
-%defattr(-,root,root,-)
-%{_fontdir}/esint10.ttf
-
-%posttrans -n %{fontname}-esint10-fonts
-fc-cache %{_fontdir} 2> /dev/null ||:
-
-%files -n %{fontname}-eufm10-fonts
-%defattr(-,root,root,-)
-%{_fontdir}/eufm10.ttf
-
-%posttrans -n %{fontname}-eufm10-fonts
-fc-cache %{_fontdir} 2> /dev/null ||:
-
-%files -n %{fontname}-msam10-fonts
-%defattr(-,root,root,-)
-%{_fontdir}/msam10.ttf
-
-%posttrans -n %{fontname}-msam10-fonts
-fc-cache %{_fontdir} 2> /dev/null ||:
-
-%files -n %{fontname}-msbm10-fonts
-%defattr(-,root,root,-)
-%{_fontdir}/msbm10.ttf
-
-%posttrans -n %{fontname}-msbm10-fonts
-fc-cache %{_fontdir} 2> /dev/null ||:
-
-%files -n %{fontname}-wasy10-fonts
-%defattr(-,root,root,-)
-%{_fontdir}/wasy10.ttf
+%{_fontdir}/
+%doc lib/fonts/BaKoMaFontLicense.txt
+%doc lib/fonts/ReadmeBaKoMa4LyX.txt
-%posttrans -n %{fontname}-wasy10-fonts
+%posttrans fonts
fc-cache %{_fontdir} 2> /dev/null ||:
-
%endif
%changelog
+* Sat Jan 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.6.5-3
+- rebiuld (boost)
+- use simple font template
+
* Wed Dec 9 2009 José Matos <jamatos at fc.up.pt> - 1.6.5-2
- Add patch for autoconf 2.65 (F13+)
More information about the scm-commits
mailing list