rpms/publican/devel .cvsignore, 1.21, 1.22 import.log, 1.10, 1.11 publican.spec, 1.39, 1.40 sources, 1.22, 1.23
Rüdiger Landmann
rlandmann at fedoraproject.org
Tue Jul 6 05:35:41 UTC 2010
Author: rlandmann
Update of /cvs/pkgs/rpms/publican/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9385/devel
Modified Files:
.cvsignore import.log publican.spec sources
Log Message:
* Tue Jul 06 2010 Jeff Fearn <jfearn at redhat.com> 2.0-0
- Add Publican::Website.
- Add web_*_label params for web menus.
- Add underscores to cleanset, installbrand, and printtree. BZ #581090
- Update docs with Website content
- Update brand license text.
- Fix different log jar path on F14+
- Add constraint to help_config output.
- Fix segfault when indexterm has no leading content. BZ #592666
- Fix inline indexterm. BZ #592823
- Translate productname tag. BZ #592669
- Fix formalpara missing ID. BZ #595564
- Add dummy lang.css to avoid 404's. BZ #595799
- Improve validation error message. BZ #593887
- Fix qandaentry ID. BZ #593892
- Fix Icon non-conformance. BZ #593890
- Fix admonitions splitting across pages. BZ #596257
- Fix HTML simple list border. BZ #599258
- Fix formal object IDs. BZ #601363
- Fix Revision History layout. BZ #559787 #598828 #598833
- Remove title color from term in HTML. BZ #592822
- Fix highlight breaking callouts. BZ #590933
- Add support for LineColumn coords in area tag.
- Update font requires for F12 and F13.
- Fix clean_ids adding newline to verbatim. BZ #604465
- Fix index missing ID. BZ #606418
- Fix files dir being missed. BZ #609345
- Adjust admonition layout.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore 12 May 2010 05:24:54 -0000 1.21
+++ .cvsignore 6 Jul 2010 05:35:41 -0000 1.22
@@ -1 +1 @@
-Publican-1.6.3.tar.gz
+Publican-2.0.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- import.log 12 May 2010 05:24:54 -0000 1.10
+++ import.log 6 Jul 2010 05:35:41 -0000 1.11
@@ -8,3 +8,4 @@ publican-1_6-0_fc12:HEAD:publican-1.6-0.
publican-1_6_1-0_fc12:HEAD:publican-1.6.1-0.fc12.src.rpm:1269387722
publican-1_6_2-0_fc12:HEAD:publican-1.6.2-0.fc12.src.rpm:1270097117
publican-1_6_3-0_fc12:HEAD:publican-1.6.3-0.fc12.src.rpm:1273641803
+publican-2_0-0_fc13:HEAD:publican-2.0-0.fc13.src.rpm:1278394403
Index: publican.spec
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/publican.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- publican.spec 1 Jun 2010 22:28:13 -0000 1.39
+++ publican.spec 6 Jul 2010 05:35:41 -0000 1.40
@@ -1,18 +1,27 @@
# Track font name changes
-%define RHEL5 %(test "%{?dist}" == ".el5" && echo 1 || echo 0)
-# Assume not rhel means FC11+
-%define OTHER %(test "%{RHEL5}" == "0" && echo 1 || echo 0)
+%define RHEL5 %(test %{?dist} == .el5 && echo 1 || echo 0)
+%define RHEL6 %(test %{?dist} == .el6 && echo 1 || echo 0)
+# Assume not rhel means FC11+ ... ugly
+%define OTHER 1
+%if %{RHEL6}
+%define OTHER 0
+%endif
+%if %{RHEL5}
+%define OTHER 0
+%endif
# who doesn't have xdg-open?
-%define HTMLVIEW %(test "%{RHEL5}" == "1" && echo 1 || echo 0)
+%define HTMLVIEW %(test %{RHEL5} == 1 && echo 1 || echo 0)
# required for desktop file install
-%define my_vendor %(test "%{RHEL5}" == "1" && echo "redhat" || echo "fedora")
+%define my_vendor %(test %{OTHER} == 1 && echo "fedora" || echo "redhat")
+
+%define TESTS 1
Name: publican
-Version: 1.6.3
-Release: 1%{?dist}
+Version: 2.0
+Release: 0%{?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
@@ -20,12 +29,24 @@ Group: Applications/Publishing
URL: https://publican.fedorahosted.org
Source0: https://fedorahosted.org/released/publican/Publican-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Limited to these arches on RHEL 6 due to PDF + Java limitations
+%if %{RHEL6}
+BuildArch: i386 x86_64
+%else
BuildArch: noarch
+%endif
+
+# Get rid of the old packages
+Obsoletes: perl-Publican-WebSite < 1.5
+Obsoletes: publican-WebSite-obsoletes < 1.21
+Provides: perl-Publican-WebSite = 1.5
+Provides: publican-WebSite-obsoletes = 1.21
BuildRequires: perl(Devel::Cover)
BuildRequires: perl(Module::Build)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::More)
+BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(Test::Perl::Critic)
BuildRequires: perl(Archive::Tar)
@@ -59,22 +80,26 @@ BuildRequires: perl(version)
BuildRequires: perl(XML::LibXML) >= 1.67
BuildRequires: perl(XML::LibXSLT) >= 1.67
BuildRequires: perl(XML::TreeBuilder) >= 3.09-15
-BuildRequires: fop >= 0.90
+BuildRequires: fop >= 0.95
BuildRequires: batik
-BuildRequires: docbook-style-xsl >= 1.75.2-6
+BuildRequires: docbook-style-xsl >= 1.75.2-5
BuildRequires: desktop-file-utils
BuildRequires: gettext
+BuildRequires: perl-Template-Toolkit
+BuildRequires: perl(DBD::SQLite)
# Most of these are handled automatically
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires: perl(Locale::Maketext::Gettext)
-Requires: fop >= 0.90
+Requires: fop >= 0.95
Requires: batik rpm-build
-Requires: docbook-style-xsl >= 1.75.2-6
+Requires: docbook-style-xsl >= 1.75.2-5
Requires: perl(XML::LibXML) >= 1.67
Requires: perl(XML::LibXSLT) >= 1.67
Requires: perl(XML::TreeBuilder) >= 3.09-15
Requires: gettext cvs
+Requires: perl-Template-Toolkit
+Requires: perl(DBD::SQLite)
# Pull in the fonts for all languages, else you can't build translated PDF in brew/koji
%if %{RHEL5}
@@ -88,6 +113,15 @@ BuildRequires: fonts-malayalam fonts-or
BuildRequires: fonts-tamil fonts-telugu liberation-fonts
#BuildRequires: java-1.5.0-sun java-1.5.0-sun-devel chkconfig
%endif
+%if %{RHEL6}
+Requires: liberation-mono-fonts liberation-sans-fonts liberation-serif-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 ipa-gothic-fonts ipa-pgothic-fonts
+BuildRequires: lklug-fonts baekmuk-ttf-batang-fonts
+%endif
%if %{OTHER}
Requires: liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts
Requires: cjkuni-uming-fonts ipa-gothic-fonts ipa-pgothic-fonts
@@ -96,21 +130,10 @@ Requires: lklug-fonts baekmuk-ttf-
BuildRequires: liberation-mono-fonts liberation-sans-fonts liberation-serif-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
-# but they don't work for PDFs anyway
-# So we aren't going to use them
-#Requires: lohit-fonts-bengali lohit-fonts-gujarati
-#Requires: lohit-fonts-hindi lohit-fonts-kannada
-#Requires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi
-#Requires: lohit-fonts-tamil lohit-fonts-telugu
-#BuildRequires: lohit-fonts-bengali lohit-fonts-gujarati
-#BuildRequires: lohit-fonts-hindi lohit-fonts-kannada
-#BuildRequires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi
-#BuildRequires: lohit-fonts-tamil lohit-fonts-telugu
%endif
Obsoletes: Publican < 1.0
+Provides: Publican = 1.0
%description
Publican is a DocBook publication system, not just a DocBook processing tool.
@@ -126,6 +149,7 @@ Requires: htmlview
Requires: xdg-utils
%endif
Obsoletes: Publican-doc < 1.0
+Provides: Publican-doc = 1.0
%description doc
Publican is a tool for publishing material authored in DocBook XML.
@@ -163,20 +187,31 @@ sed -i -e 's|xdg-open|htmlview|' %{name}
desktop-file-install --vendor="%{my_vendor}" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop
+for file in po/*.po; do
+ lang=`echo "$file" | sed -e 's/po\/\(.*\)\.po/\1/'`;
+ mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES;
+ msgfmt $file -o $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES/%{name}.mo;
+done
+
+%find_lang %{name}
+
%check
+%if %{TESTS}
./Build test
-
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%files -f %{name}.lang
%defattr(-,root,root,-)
%doc CHANGES README COPYING Artistic
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%{perl_vendorlib}/Publican.pm
+%{perl_vendorlib}/Publican/*
+%{_mandir}/man3/Publican*
%{_mandir}/man1/*
%{_bindir}/publican
%{_datadir}/publican
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/publican-website.cfg
%files doc
%defattr(-,root,root,-)
@@ -185,8 +220,34 @@ rm -rf $RPM_BUILD_ROOT
%doc fdl.txt
%changelog
-* Wed Jun 02 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.6.3-1
-- Mass rebuild with perl-5.12.0
+* Tue Jul 06 2010 Jeff Fearn <jfearn at redhat.com> 2.0-0
+- Add Publican::Website.
+- Add web_*_label params for web menus.
+- Add underscores to cleanset, installbrand, and printtree. BZ #581090
+- Update docs with Website content
+- Update brand license text.
+- Fix different log jar path on F14+
+- Add constraint to help_config output.
+- Fix segfault when indexterm has no leading content. BZ #592666
+- Fix inline indexterm. BZ #592823
+- Translate productname tag. BZ #592669
+- Fix formalpara missing ID. BZ #595564
+- Add dummy lang.css to avoid 404's. BZ #595799
+- Improve validation error message. BZ #593887
+- Fix qandaentry ID. BZ #593892
+- Fix Icon non-conformance. BZ #593890
+- Fix admonitions splitting across pages. BZ #596257
+- Fix HTML simple list border. BZ #599258
+- Fix formal object IDs. BZ #601363
+- Fix Revision History layout. BZ #559787 #598828 #598833
+- Remove title color from term in HTML. BZ #592822
+- Fix highlight breaking callouts. BZ #590933
+- Add support for LineColumn coords in area tag.
+- Update font requires for F12 and F13.
+- Fix clean_ids adding newline to verbatim. BZ #604465
+- Fix index missing ID. BZ #606418
+- Fix files dir being missed. BZ #609345
+- Adjust admonition layout.
* Wed May 12 2010 Jeff Fearn <jfearn at redhat.com> 1.6.3-0
- Disable verbatim hyphenation. BZ #577068
@@ -921,3 +982,5 @@ rm -rf $RPM_BUILD_ROOT
- Initial creation
+
+
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/publican/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources 12 May 2010 05:24:54 -0000 1.22
+++ sources 6 Jul 2010 05:35:41 -0000 1.23
@@ -1 +1 @@
-928afb23f0c3ceb1533a52a1a5fc7153 Publican-1.6.3.tar.gz
+c2c707ef3cd4df0c738622bd7d4885fa Publican-2.0.tar.gz
More information about the scm-commits
mailing list