Hello community,
here is the log from the commit of package release-notes-openSUSE for
openSUSE:Factory checked in at 2014-07-24 10:06:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/release-notes-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.release-notes-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "release-notes-openSUSE"
Changes:
--------
---
/work/SRC/openSUSE:Factory/release-notes-openSUSE/release-notes-openSUSE.changes
2013-12-11 16:54:49.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.release-notes-openSUSE.new/release-notes-openSUSE.changes
2014-07-24 10:06:28.000000000 +0200
@@ -1,0 +2,13 @@
+Tue Jul 22 12:01:49 UTC 2014 - rsalev...@suse.com
+
+- 13.2.20140722
+ * update make infrastucture
+ * normalize release-notes.xml
+
+-------------------------------------------------------------------
+Thu Jul 10 12:33:25 UTC 2014 - rsalev...@suse.com
+
+- 13.2.1:
+ * use DAPS for building the RNs
+
+-------------------------------------------------------------------
Old:
----
release-notes-openSUSE.desktop.in
release-notes-opensuse-13.2.0.tar.bz2
New:
----
_service
release-notes-openSUSE-13.2.20140722.tar.bz2
release-notes-openSUSE.desktop
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ release-notes-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.foE0A9/_old 2014-07-24 10:06:29.000000000 +0200
+++ /var/tmp/diff_new_pack.foE0A9/_new 2014-07-24 10:06:29.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package release-notes-openSUSE
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,84 +17,62 @@
Name: release-notes-openSUSE
-BuildRequires: docbook-xsl-stylesheets
-BuildRequires: libxslt
+Version: 13.2.20140722
+Release: 0
+Summary: Release Notes for openSUSE
+License: GFDL-1.3
+Group: Documentation/SUSE
+Url: https://github.com/openSUSE/release-notes-openSUSE
+BuildRequires: daps
+BuildRequires: gettext-tools
BuildRequires: recode
+BuildRequires: suse-xsl-stylesheets
BuildRequires: update-desktop-files
BuildRequires: w3m
BuildRequires: xml2po
BuildRequires: xmlcharent
-%ifarch i586 x86_64 ppc ppc64
-BuildRequires: xmlgraphics-fop
-%endif
-Summary: Release Notes for this openSUSE Release
-License: GFDL-1.2
-Group: Documentation/SUSE
+BuildRequires: xsltproc
+Requires: dejavu-fonts
+Requires: google-opensans-fonts
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Version: 13.2.0
-Release: 0
Provides: release-notes = %{version}
-Source0: release-notes-opensuse-%{version}.tar.bz2
-Source8: %{name}.desktop.in
-Url: http://en.opensuse.org
+Source: %{name}-%{version}.tar.bz2
+Source1: %{name}.desktop
%description
This package contains the release notes with the most important changes
for this openSUSE release. In HTML format, they are available in the
help center.
-The release notes are maintained in the public SVN repository at
-https://svn.opensuse.org/svn/opensuse-doc/trunk/release-notes/opensuse.
-
%prep
-%setup -q -n release-notes-opensuse-%{version}
-# rfile=RELEASE-NOTES-openSUSE.en.po
-rfile=po/en.po
-[ -f $rfile ] || {
- echo $rfile is missing
- exit 1
-}
+%setup -q
%build
%define SUSE_PROD openSUSE
-./configure --prefix=/usr
-make all pdf arch=%_arch prod=slprof SUSE_PROD=%SUSE_PROD
+sed -i 's/@VERSION@/%{version}/' xml/release-notes.ent
+make all
%install
-make DESTDIR=$RPM_BUILD_ROOT SUSE_PROD=%SUSE_PROD install
-rnpath="${RPM_BUILD_ROOT}"/usr/share/doc/release-notes/%SUSE_PROD
-[ -f $rnpath/RELEASE-NOTES.cs.html ] && {
- [ -f $rnpath/RELEASE-NOTES.sk.html ] || {
- ln -s RELEASE-NOTES.cs.html $rnpath/RELEASE-NOTES.sk.html
- # ln -s RELEASE-NOTES.cs.rtf $rnpath/RELEASE-NOTES.sk.rtf
- }
-}
-for h in $rnpath/RELEASE-NOTES.*.html; do
- ln -s ${h#$rnpath/} ${h/html/rtf}
+rnpath=%{buildroot}%{_datadir}/doc/release-notes/%{SUSE_PROD}
+%{__install} -m 0644 -D "%{_sourcedir}/%{name}.desktop"
"%{buildroot}%{_datadir}/susehelp/meta/%{name}.desktop"
+for file in build/release-notes.*; do
+ lang=$(echo "$file" | awk -F '.' '{print $2}')
+ echo "DocPath[${lang}]=${rnpath}/RELEASE-NOTES.${lang}.html"
+ %{__install} -m 0644 -D
"${file}/single-html/release-notes.${lang}/release-notes.${lang}.html"
"${rnpath}/RELEASE-NOTES.${lang}.html"
+ %{__cp} -R "${file}/single-html/release-notes.${lang}/static/"
"${rnpath}"
+ %{__install} -m 0644 -D "${file}/yast-html/release-notes.${lang}.html"
"${rnpath}/RELEASE-NOTES.${lang}.rtf"
+ %{__install} -m 0644 -D "${file}/release-notes.${lang}_color_$lang.pdf"
"${rnpath}/RELEASE-NOTES.${lang}.pdf"
+ %{__install} -m 0644 -D "${file}/release-notes.${lang}.txt"
"${rnpath}/RELEASE-NOTES.${lang}.txt"
done
-
-mkdir -p $RPM_BUILD_ROOT/usr/share/susehelp/meta
-sed 's/@SUSE_PROD@/%{SUSE_PROD}/' $RPM_SOURCE_DIR/%{name}.desktop.in \
- > $RPM_BUILD_ROOT/usr/share/susehelp/meta/%{name}.desktop
-{
- for f in
"${RPM_BUILD_ROOT}"/usr/share/doc/release-notes/%SUSE_PROD/RELEASE-NOTES.*.html
; do
- l=${f%\.html}
- l=${l##*\.}
- echo
"DocPath[$l]=/usr/share/doc/release-notes/%{SUSE_PROD}/RELEASE-NOTES.$l.html"
- done
-} >>$RPM_BUILD_ROOT/usr/share/susehelp/meta/%{name}.desktop
-%suse_update_desktop_file
$RPM_BUILD_ROOT/usr/share/susehelp/meta/%{name}.desktop
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%suse_update_desktop_file %{buildroot}%{_datadir}/susehelp/meta/%{name}.desktop
%files
%defattr(-,root,root)
-%doc fdl.txt
-%dir /usr/share/susehelp
-%dir /usr/share/susehelp/meta
-/usr/share/susehelp/meta/%{name}.desktop
-%doc /usr/share/doc/release-notes
+%doc LICENSE
+%doc %{_datadir}/doc/release-notes/
+%dir %{_datadir}/susehelp/
+%dir %{_datadir}/susehelp/meta/
+%{_datadir}/susehelp/meta/%{name}.desktop
%changelog
++++++ _service ++++++
<services>
<service name="tar_scm" mode="localonly">
<param name="versionformat">%ad</param>
<param name="versionprefix">13.2</param>
<param
name="url">git://github.com/openSUSE/release-notes-openSUSE.git</param>
<param name="scm">git</param>
</service>
<service name="recompress" mode="localonly">
<param name="file">*.tar</param>
<param name="compression">bz2</param>
</service>
<service name="set_version" mode="localonly"/>
</services>
++++++ release-notes-openSUSE.desktop ++++++
[Desktop Entry]
Name=openSUSE Release Notes
Name[de]=openSUSE Release Notes
Comment=A short description of the most important changes for this openSUSE
release
Comment[de]=Eine kurze Beschreibung der wichtigsten Änderungen in dieser
openSUSE-Ausgabe
X-DOC-SearchMethod=htdig
X-DOC-SearchEnabledDefault=true
X-DOC-DocumentType=text/html
X-DOC-Weight=-5000
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
