Hello community, here is the log from the commit of package susedoc for openSUSE:Factory checked in at Sun Sep 27 00:25:12 CEST 2009. -------- --- susedoc/susedoc.changes 2009-07-09 13:56:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/susedoc/susedoc.changes 2009-09-25 10:41:46.000000000 +0200 @@ -2 +2 @@ -Thu Jul 9 13:55:10 CEST 2009 - toms@suse.de +Fri Sep 25 07:33:41 UTC 2009 - toms@suse.de @@ -4,5 +4,67 @@ -- Corrected SPEC file problems: - . Removed files-duplicate filter in susedoc-rpmlintrc - . Removed macro in version keyword - . Added susedoc-rpmlintrc as source - . Inserted fdupes to avoid file duplicates +- Improved SPEC file: + * Disabled addFilter line in rpmlintrc file, added comments + * Corrected PreReq to libxml2 sgml-skel, removed awk + * Used versioned Obsoletes/Provides for novdoc-schema + Thanks very much, Lars! :-) + +------------------------------------------------------------------- +Thu Sep 24 13:55:40 CEST 2009 - toms@suse.de + +- Added template for PI suse-quickstart which can hold different + color schemas for openSUSE (suse, dark-suse) or Novell (novell). + +------------------------------------------------------------------- +Mon Aug 31 13:19:56 CEST 2009 - toms@suse.de + +- Fixed really the forgotten translation for ko.xml + +------------------------------------------------------------------- +Tue Aug 25 15:33:08 CEST 2009 - toms@suse.de + +- Fixed some translation of ko.xml +- Corrected appearance of part for Korean + (label+gentext instead of gentext+label) +=> Thanks to Patrick Tinley! + +------------------------------------------------------------------- +Mon Aug 24 10:19:51 CEST 2009 - toms@suse.de + +- Integrated parameters for FOP and XEP in l10n/*.xml files for + pocket layout. Thanks to Luiz! + +------------------------------------------------------------------- +Wed Aug 19 09:09:06 CEST 2009 - toms@suse.de + +- Fixed bug when building Quickstarts with FOP: licenses were omitted + Thanks to Luiz Fernando Ranghetti! + +------------------------------------------------------------------- +Thu Aug 13 09:02:30 CEST 2009 - toms@suse.de + +- Corrected id -> role in fo/articletitlepage.xsl (Thanks Luiz!) +- Finalized new pocket format + +------------------------------------------------------------------- +Thu Aug 6 15:05:21 CEST 2009 - toms@suse.de + +- Requires version 1.75 docbook-xsl-stylesheets +- Requires mplus-fonts and liberation-fonts (for pocket format) + +------------------------------------------------------------------- +Thu Aug 6 08:47:56 CEST 2009 - toms@suse.de + +- Removed "部" in part title of zh_TW (Thanks Patrick!) + +------------------------------------------------------------------- +Tue Aug 4 13:31:55 CEST 2009 - toms@suse.de + +- Added language fix for es, hu, and zh_{cn,tw} +- Prepared pocket format (work in progress) +- Enhanced list of recommended fonts with dejavu, liberation-fonts + +------------------------------------------------------------------- +Wed Jul 8 08:42:32 CEST 2009 - toms@suse.de + +- Changed SPEC file, mostly due to FOP: + . Added requires section: dejavu LinuxLibertine + . Added recommends section: fifth-leg-font calling whatdependson for head-i586 Old: ---- susedoc-4.2_20090707.tar.bz2 New: ---- susedoc-4.2_20090924.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ susedoc.spec ++++++ --- /var/tmp/diff_new_pack.OHSkZh/_old 2009-09-27 00:24:39.000000000 +0200 +++ /var/tmp/diff_new_pack.OHSkZh/_new 2009-09-27 00:24:39.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package susedoc (Version 4.2_20090707) +# spec file for package susedoc (Version 4.2_20090924) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,16 +18,21 @@ # norootforbuild %define dtdversion 1.0 +%define packageversion 4.2 %define dtdname novdoc %define docbuilddir /usr/share/susedoc +%define _version 20090924 +%define _name susedoc +%define regcat /usr/bin/sgml-register-catalog Name: susedoc -#Version: %{packageversion}_%{_version} -Version: 4.2_20090707 +Version: %{packageversion}_%{_version} Release: 1 Summary: XML Build Mechanics for Novell, SUSE, and openSUSE Documentation -Requires: libxml2 libxslt inkscape transfig ImageMagick java xml-commons-resolver docbook-xsl-stylesheets svg-dtd freefont xalan-j2 dia fop >= 0.94 make +Requires: libxml2 libxslt inkscape transfig ImageMagick java xml-commons-resolver svg-dtd freefont xalan-j2 dia fop >= 0.94 make +Requires: docbook-xsl-stylesheets >= 1.75 Requires: docbook_4 xmlformat optipng +Requires: dejavu LinuxLibertine mplus-fonts liberation-fonts # #%if 0%{?opensuse_bs} #%else @@ -35,7 +40,7 @@ #%endif # %if %suse_version >= 1100 -Recommends: agfa-fonts +Recommends: agfa-fonts fifth-leg-font # Korean Fonts: Recommends: unfonts # Japanese Fonts: @@ -46,22 +51,24 @@ Recommends: FZSongTi FZHeiTi FZFangSong %endif BuildRequires: sgml-skel unzip +%if 0%{?suse_version} > 1020 BuildRequires: fdupes +%endif License: GPL Group: Productivity/Publishing/XML AutoReqProv: on # Needs to be fixed to openSUSE build server: Url: http://www.opensuse.org/Documentation_Team -Source0: %{name}-%{version}.tar.bz2 -Source1: %{name}-rpmlintrc +Source0: %{_name}-%{packageversion}_%{_version}.tar.bz2 +Source1: susedoc-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -%define regcat /usr/bin/sgml-register-catalog -PreReq: %{regcat} /usr/bin/xmlcatalog -PreReq: awk +PreReq: libxml2 sgml-skel +%if %suse_version <= 1100 Obsoletes: novdoc-schema Provides: novdoc-schema #Recommends: agfa-fonts ttf-founder unfonts sazanami-fonts +%endif %description This RPM consists of a set of stylesheets, scripts and makefiles that @@ -108,7 +115,6 @@ xmlcatbin=/usr/bin/xmlcatalog # build root catalog fragment %{__rm} -f %{FOR_ROOT_CAT}.tmp %{FOR_XSLT_CAT}.tmp -# [ -e bin/create_dm_docu.py ] && %{__rm} bin/create_dm_docu.py $xmlcatbin --noout --create %{FOR_ROOT_CAT}.tmp #CATALOG=%{xml_mod_dtd_dir}/catalog.xml NOVCAT=%{xml_mod_dtd_dir}/catalog.xml @@ -122,7 +128,7 @@ /<\/catalog/i\ </group>' \ %{FOR_ROOT_CAT}.tmp > %{FOR_ROOT_CAT} -# +# Register different URNs: $xmlcatbin --noout --create %{FOR_XSLT_CAT}.tmp $xmlcatbin --noout --add "system" "urn:x-suse:xslt:profiling:docbook41-profile.xsl" \ "file://%{docbuilddir}/xslt/profiling/docbook41-profile.xsl" %{FOR_XSLT_CAT}.tmp @@ -146,7 +152,7 @@ %install [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] \ && %{__rm} -rf $RPM_BUILD_ROOT -mkdir %buildroot +%{__mkdir} %buildroot %{__mkdir_p} $RPM_BUILD_ROOT/usr/share \ $RPM_BUILD_ROOT/%{_bindir} \ $RPM_BUILD_ROOT/%{xml_dir}/%{dtdname}/schema/{dtd,rng}/%{dtdversion} @@ -168,7 +174,11 @@ %{INSTALL_DATA} %{FOR_XSLT_CAT} $cat_dir %define all_cat CATALOG.%{dtdname}-%{dtdversion} %{__mv} $RPM_BUILD_ROOT/%{docbuilddir}/bin/susedoc-new.py $RPM_BUILD_ROOT/%{_bindir} -%fdupes $RPM_BUILD_ROOT +# create symlinks: +%if 0%{?suse_version} > 1020 + %fdupes -s $RPM_BUILD_ROOT/%{docbuilddir}/etc/XEP + %fdupes -s $RPM_BUILD_ROOT/%{docbuilddir}/xslt +%endif #---------------------- %post @@ -202,7 +212,7 @@ %files %defattr(-,root,root) -#%dir %{sgml_dir} +# %dir %{sgml_dir} %config %{sgml_var_dir}/* %config %{xml_sysconf_dir}/%{FOR_ROOT_CAT} %config %{xml_sysconf_dir}/%{FOR_XSLT_CAT} @@ -210,6 +220,6 @@ %{sgml_dir}/CATALOG.%{dtdname}-%{dtdversion} %{xml_dir}/%{dtdname}/ %{docbuilddir} - # + %changelog ++++++ susedoc-4.2_20090707.tar.bz2 -> susedoc-4.2_20090924.tar.bz2 ++++++ ++++ 13065 lines of diff (skipped) ++++++ susedoc-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.OHSkZh/_old 2009-09-27 00:24:41.000000000 +0200 +++ /var/tmp/diff_new_pack.OHSkZh/_new 2009-09-27 00:24:41.000000000 +0200 @@ -3,3 +3,9 @@ addFilter("no-packager-tag") addFilter("explicit-lib-dependency libxml2") addFilter("explicit-lib-dependency libxslt") +# We need this package and RPM has no way to determine this: +addFilter("explicit-lib-dependency liberation-fonts") +# For the future, this might be enabled: +# addFilter("files-duplicate .*/flyer/header.xsl") +addFilter("zero-length .*/FOP/README") +addFilter("non-executable-script .*/bin/create_dm_docu.py") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org