rpms/publican/F-12 .cvsignore, 1.15, 1.16 import.log, 1.4, 1.5 publican.spec, 1.31, 1.32 sources, 1.16, 1.17

Rüdiger Landmann rlandmann at fedoraproject.org
Fri Jan 29 01:14:09 UTC 2010 

Author: rlandmann

Update of /cvs/pkgs/rpms/publican/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18879/F-12

Modified Files:
	.cvsignore import.log publican.spec sources 
Log Message:
* Fri Jan 29 2010 Jeff Fearn <jfearn at redhat.com> 1.4-1
- make font BuildRequires match requires.

* Mon Jan 25 2010 Jeff Fearn <jfearn at redhat.com> 1.4-0
- Ignore obsolete entries in stats code. BZ #546130
- Fix valid_lang matching on unknown languages.
- Fix invalid tag in DTD. BZ #548629
- Added contrib to translation tag list. BZ #550460
- Added firstname, lastname, orgname to translation tag list. BZ #555645
- Remove comments from translations. BZ #555647
- Fix content in root nodes not being added to pot. BZ #554261
- Fix mixed mode content being dropped when merging translations. BZ #549925
- Fix ID creation in refentry. BZ #553085
- Add gettext Requires. BZ #550461
- Fix non-default tmp dir. BZ #551974
- Fix validation output. BZ #556684
- Fix tag attributes breaking translation merge. BZ #554230
- Format XML when running create. BZ #556201
- Switch Japanese font to ipa-gothic-fonts on Fedora.
- Fix Japanes mono/proportional font selection.
- Add TTC build time script. BZ #557336
- Add check for main file before parsing.
- Add check for OS before running FOP.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	8 Dec 2009 01:17:56 -0000	1.15
+++ .cvsignore	29 Jan 2010 01:14:09 -0000	1.16
@@ -1 +1 @@
-Publican-1.3.tar.gz
+Publican-1.4.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-12/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	8 Dec 2009 01:17:56 -0000	1.4
+++ import.log	29 Jan 2010 01:14:09 -0000	1.5
@@ -2,3 +2,4 @@ publican-1_0-0_fc11:F-12:publican-1.0-0.
 publican-1_1-0_fc11:F-12:publican-1.1-0.fc11.src.rpm:1257134462
 publican-1_2-0_fc11:F-12:publican-1.2-0.fc11.src.rpm:1257311998
 publican-1_3-0_fc12:F-12:publican-1.3-0.fc12.src.rpm:1260234966
+publican-1_4-1_fc12:F-12:publican-1.4-1.fc12.src.rpm:1264727514


Index: publican.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-12/publican.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- publican.spec	8 Dec 2009 01:17:56 -0000	1.31
+++ publican.spec	29 Jan 2010 01:14:09 -0000	1.32
@@ -11,8 +11,8 @@
 %define my_vendor %(test "%{RHEL5}" == "1" && echo "redhat" || echo "fedora")
 
 Name:           publican
-Version:        1.3
-Release:        0%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Summary:        Common files and scripts for publishing with DocBook XML
 # For a breakdown of the licensing, refer to LICENSE
 License:        (GPLv2+ or Artistic) and CC0
@@ -62,6 +62,7 @@ BuildRequires:  fop >= 0.90
 BuildRequires:  batik
 BuildRequires:  docbook-style-xsl >= 1.75.1
 BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
 
 # Most of these are handled automatically
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -72,6 +73,7 @@ Requires:       docbook-style-xsl >= 1.7
 Requires:       perl(XML::LibXML)  >=  1.67
 Requires:       perl(XML::LibXSLT) >=  1.67
 Requires:       perl(XML::TreeBuilder) >= 3.09-15
+Requires:       gettext
 
 # Pull in the fonts for all languages, else you can't build translated PDF in brew/koji
 %if %{RHEL5}
@@ -87,11 +89,11 @@ BuildRequires:  fonts-tamil fonts-telugu
 %endif
 %if %{OTHER}
 Requires:       liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts
-Requires:       cjkuni-uming-fonts  sazanami-gothic-fonts sazanami-mincho-fonts
+Requires:       cjkuni-uming-fonts ipa-gothic-fonts ipa-pgothic-fonts
 Requires:       lklug-fonts baekmuk-ttf-batang-fonts
 
 BuildRequires:  liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts
-BuildRequires:  cjkuni-uming-fonts sazanami-gothic-fonts sazanami-mincho-fonts
+BuildRequires:  cjkuni-uming-fonts ipa-gothic-fonts ipa-pgothic-fonts
 BuildRequires:  lklug-fonts baekmuk-ttf-batang-fonts
 # Indic font names have changed AGAIN (F12)
 # and AGAIN they fail to set Provides
@@ -149,6 +151,8 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 
 %{_fixperms} $RPM_BUILD_ROOT/*
 
+./fop-ttc-metric.pl --outdir $RPM_BUILD_ROOT%{_datadir}/publican/fop/font-metrics --conffile $RPM_BUILD_ROOT%{_datadir}/publican/fop/fop.xconf
+
 sed -i -e 's|@@FILE@@|%{_docdir}/%{name}-doc-%{version}/en-US/index.html|' %{name}.desktop
 sed -i -e 's|@@ICON@@|%{_docdir}/%{name}-doc-%{version}/en-US/images/icon.svg|' %{name}.desktop
 
@@ -159,8 +163,6 @@ sed -i -e 's|xdg-open|htmlview|' %{name}
 desktop-file-install --vendor="%{my_vendor}" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop
 
 %check
-#alternatives --auto java
-#alternatives --auto javac
 #./Build test
 
 %clean
@@ -182,6 +184,30 @@ rm -rf $RPM_BUILD_ROOT
 %doc fdl.txt
 
 %changelog
+* Fri Jan 29 2010 Jeff Fearn <jfearn at redhat.com> 1.4-1
+- make font BuildRequires match requires.
+
+* Mon Jan 25 2010 Jeff Fearn <jfearn at redhat.com> 1.4-0
+- Ignore obsolete entries in stats code. BZ #546130
+- Fix valid_lang matching on unknown languages.
+- Fix invalid tag in DTD. BZ #548629
+- Added contrib to translation tag list. BZ #550460
+- Added firstname, lastname, orgname to translation tag list. BZ #555645
+- Remove comments from translations. BZ #555647
+- Fix content in root nodes not being added to pot. BZ #554261
+- Fix mixed mode content being dropped when merging translations. BZ #549925
+- Fix ID creation in refentry. BZ #553085
+- Add gettext Requires. BZ #550461
+- Fix non-default tmp dir. BZ #551974
+- Fix validation output. BZ #556684
+- Fix tag attributes breaking translation merge. BZ #554230
+- Format XML when running create. BZ #556201
+- Switch Japanese font to ipa-gothic-fonts on Fedora.
+- Fix Japanes mono/proportional font selection.
+- Add TTC build time script. BZ #557336
+- Add check for main file before parsing.
+- Add check for OS before running FOP.
+
 * Tue Dec 08 2009 Jeff Fearn <jfearn at redhat.com> 1.3-0
 - Fixed --version BZ #533081
 - Fixed empty params in new book cfg file. BZ #533322
@@ -822,3 +848,4 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Feb 07 2007 Jeff Fearn <jfearn at redhat.com> 0.0
 - Initial creation
 
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	8 Dec 2009 01:17:56 -0000	1.16
+++ sources	29 Jan 2010 01:14:09 -0000	1.17
@@ -1 +1 @@
-3306dcc97650adf3eb0266145f8a679f  Publican-1.3.tar.gz
+ff0bb2f00624a229df2ca6bb4de4af9a  Publican-1.4.tar.gz

More information about the scm-commits mailing list