diff --git a/.cvsignore b/.cvsignore index 69b141a..9bc449c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Publican-1.2.tar.gz +Publican-1.3.tar.gz diff --git a/import.log b/import.log index 76bc987..815c8c9 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ publican-1_0-0_fc11:HEAD:publican-1.0-0.fc11.src.rpm:1257031816 publican-1_1-0_fc11:HEAD:publican-1.1-0.fc11.src.rpm:1257134206 publican-1_2-0_fc11:HEAD:publican-1.2-0.fc11.src.rpm:1257311243 +publican-1_3-0_fc12:HEAD:publican-1.3-0.fc12.src.rpm:1260234376 diff --git a/publican.spec b/publican.spec index 5637375..dea3ec2 100644 --- a/publican.spec +++ b/publican.spec @@ -1,9 +1,8 @@ # Track font name changes -%define RHEL5 %(test "%{?dist}" == ".el5" && echo 1 || echo 0) -%define FC10 %(test "%{?dist}" == ".fc10" && echo 1 || echo 0) -# Assume not rhel and not FC10 means FC11+ -%define OTHER %(test "%{RHEL5}" == "0" -a "%{FC10}" == "0" && echo 1 || echo 0) +%define RHEL5 %(test "%{?dist}" == ".el5" && echo 1 || echo 0) +# Assume not rhel means FC11+ +%define OTHER %(test "%{RHEL5}" == "0" && echo 1 || echo 0) # who doesn't have xdg-open? %define HTMLVIEW %(test "%{RHEL5}" == "1" && echo 1 || echo 0) @@ -11,16 +10,15 @@ # required for desktop file install %define my_vendor %(test "%{RHEL5}" == "1" && echo "redhat" || echo "fedora") -# TODO after beta revert to lower case name Name: publican -Version: 1.2 -Release: 1%{?dist} +Version: 1.3 +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 Group: Applications/Publishing URL: https://publican.fedorahosted.org -Source0: https://fedorahosted.org/releases/publican/Publican-%{version}.tar.gz +Source0: https://fedorahosted.org/released/publican/Publican-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -31,6 +29,7 @@ BuildRequires: perl(Test::More) BuildRequires: perl(Test::Pod::Coverage) BuildRequires: perl(Test::Perl::Critic) BuildRequires: perl(Archive::Tar) +BuildRequires: perl(Archive::Zip) BuildRequires: perl(Carp) BuildRequires: perl(Config::Simple) BuildRequires: perl(Cwd) @@ -68,7 +67,7 @@ BuildRequires: desktop-file-utils Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(Locale::Maketext::Gettext) Requires: fop >= 0.90 -Requires: batik +Requires: batik rpm-build Requires: docbook-style-xsl >= 1.75.1 Requires: perl(XML::LibXML) >= 1.67 Requires: perl(XML::LibXSLT) >= 1.67 @@ -84,17 +83,7 @@ BuildRequires: fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati BuildRequires: fonts-hindi fonts-japanese fonts-kannada fonts-korean BuildRequires: fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala BuildRequires: fonts-tamil fonts-telugu liberation-fonts -%endif -%if %{FC10} -Requires: lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati -Requires: lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada -Requires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts -Requires: lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang - -BuildRequires: lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati -BuildRequires: lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada -BuildRequires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts -BuildRequires: lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang +#BuildRequires: java-1.5.0-sun java-1.5.0-sun-devel chkconfig %endif %if %{OTHER} Requires: liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts @@ -118,7 +107,7 @@ BuildRequires: lklug-fonts baekmuk-ttf-batang-fonts #BuildRequires: lohit-fonts-tamil lohit-fonts-telugu %endif -Obsoletes: Publican < 1.0 +Obsoletes: Publican < 1.0 %description Publican is a DocBook publication system, not just a DocBook processing tool. @@ -133,7 +122,7 @@ Requires: htmlview %else Requires: xdg-utils %endif -Obsoletes: Publican-doc < 1.0 +Obsoletes: Publican-doc < 1.0 %description doc Publican is a tool for publishing material authored in DocBook XML. @@ -170,6 +159,8 @@ sed -i -e 's|xdg-open|htmlview|' %{name}.desktop desktop-file-install --vendor="%{my_vendor}" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop %check +#alternatives --auto java +#alternatives --auto javac #./Build test %clean @@ -177,7 +168,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc CHANGES README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %{_mandir}/man1/* @@ -191,15 +182,34 @@ rm -rf $RPM_BUILD_ROOT %doc fdl.txt %changelog -* Mon Dec 7 2009 Stepan Kasal - 1.2-1 -- rebuild against perl 5.10.1 +* Tue Dec 08 2009 Jeff Fearn 1.3-0 +- Fixed --version BZ #533081 +- Fixed empty params in new book cfg file. BZ #533322 +- Fixed clean_ids taking too long. +- Added nowait option for brew. +- Improved epub support. BZ #536706 +- Add missing rpm-build req. BZ #537970 +- Changed ol ol style. BZ #537256 +- Fix missing revision history field crash. BZ #539741 +- Fix bug in condition logic in XmlClean. BZ #540685 +- Add translation stats. BZ #540696 +- Stopped processing xml files in extras dir. BZ #540383 +- Fixed callout rendering. BZ #531686 +- Fix wrong docs for condition usage. BZ #540691 +- Remove list style from stepalternatives. BZ #511404 +- Force step::para to keep-with-next if followed by a figure. +- Edited Conventions.xml. +- Exclude Legal_Notice.xml from pot creation. +- Fix nested XML breaking translations. +- Fix syntax highlighting adding whitespace. BZ #544141 +- Better error message for Kate language mismatch. * Wed Nov 4 2009 Jeff Fearn 1.2-0 - Fix images missing from distributed set output. BZ #532837 - Correct image path when running clean_ids. - Fix typo in format description. BZ #532379 - Add comment to clean. -- force package to run clean to avoid stale content. +- force package to run clean to avoid stale content. BZ #538676 * Mon Nov 2 2009 Jeff Fearn 1.1-0 - Fix brew failure. BZ #532383 diff --git a/sources b/sources index be27973..4529717 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8bc5739ff2d97af9d4a50968929983b3 Publican-1.2.tar.gz +3306dcc97650adf3eb0266145f8a679f Publican-1.3.tar.gz