Change-Id: I2de005456a62c93f05043abdff7e60ccd1bc60b2
Reviewed-on: http://photon-jenkins.eng.vmware.com/625
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: suezzelur <anishs@vmware.com>
... | ... |
@@ -1,7 +1,7 @@ |
1 | 1 |
Summary: Docbook-xml-4.5 |
2 | 2 |
Name: docbook-xml |
3 | 3 |
Version: 4.5 |
4 |
-Release: 3%{?dist} |
|
4 |
+Release: 4%{?dist} |
|
5 | 5 |
License: MIT |
6 | 6 |
URL: http://www.docbook.org |
7 | 7 |
Source0: http://www.docbook.org/xml/4.5/%{name}-%{version}.zip |
... | ... |
@@ -44,43 +44,43 @@ xmlcatalog --noout --add "public" \ |
44 | 44 |
/etc/xml/docbook && |
45 | 45 |
xmlcatalog --noout --add "public" \ |
46 | 46 |
"-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \ |
47 |
- "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \ |
|
47 |
+ "file:///usr/share/xml/docbook/docbook-xml-4.5/calstblx.dtd" \ |
|
48 | 48 |
/etc/xml/docbook && |
49 | 49 |
xmlcatalog --noout --add "public" \ |
50 | 50 |
"-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ |
51 |
- "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \ |
|
51 |
+ "file:///usr/share/xml/docbook/docbook-xml-4.5/soextblx.dtd" \ |
|
52 | 52 |
/etc/xml/docbook && |
53 | 53 |
xmlcatalog --noout --add "public" \ |
54 | 54 |
"-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \ |
55 |
- "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \ |
|
55 |
+ "file:///usr/share/xml/docbook/docbook-xml-4.5/dbpoolx.mod" \ |
|
56 | 56 |
/etc/xml/docbook && |
57 | 57 |
xmlcatalog --noout --add "public" \ |
58 | 58 |
"-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \ |
59 |
- "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \ |
|
59 |
+ "file:///usr/share/xml/docbook/docbook-xml-4.5/dbhierx.mod" \ |
|
60 | 60 |
/etc/xml/docbook && |
61 | 61 |
xmlcatalog --noout --add "public" \ |
62 | 62 |
"-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \ |
63 |
- "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \ |
|
63 |
+ "file:///usr/share/xml/docbook/docbook-xml-4.5/htmltblx.mod" \ |
|
64 | 64 |
/etc/xml/docbook && |
65 | 65 |
xmlcatalog --noout --add "public" \ |
66 | 66 |
"-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \ |
67 |
- "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \ |
|
67 |
+ "file:///usr/share/xml/docbook/docbook-xml-4.5/dbnotnx.mod" \ |
|
68 | 68 |
/etc/xml/docbook && |
69 | 69 |
xmlcatalog --noout --add "public" \ |
70 | 70 |
"-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \ |
71 |
- "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \ |
|
71 |
+ "file:///usr/share/xml/docbook/docbook-xml-4.5/dbcentx.mod" \ |
|
72 | 72 |
/etc/xml/docbook && |
73 | 73 |
xmlcatalog --noout --add "public" \ |
74 | 74 |
"-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \ |
75 |
- "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \ |
|
75 |
+ "file:///usr/share/xml/docbook/docbook-xml-4.5/dbgenent.mod" \ |
|
76 | 76 |
/etc/xml/docbook && |
77 | 77 |
xmlcatalog --noout --add "rewriteSystem" \ |
78 | 78 |
"http://www.oasis-open.org/docbook/xml/4.5" \ |
79 |
- "file:///usr/share/xml/docbook/xml-dtd-4.5" \ |
|
79 |
+ "file:///usr/share/xml/docbook/docbook-xml-4.5" \ |
|
80 | 80 |
/etc/xml/docbook && |
81 | 81 |
xmlcatalog --noout --add "rewriteURI" \ |
82 | 82 |
"http://www.oasis-open.org/docbook/xml/4.5" \ |
83 |
- "file:///usr/share/xml/docbook/xml-dtd-4.5" \ |
|
83 |
+ "file:///usr/share/xml/docbook/docbook-xml-4.5" \ |
|
84 | 84 |
/etc/xml/docbook |
85 | 85 |
|
86 | 86 |
if [ ! -e /etc/xml/catalog ]; then |
... | ... |
@@ -111,11 +111,11 @@ do |
111 | 111 |
/etc/xml/docbook |
112 | 112 |
xmlcatalog --noout --add "rewriteSystem" \ |
113 | 113 |
"http://www.oasis-open.org/docbook/xml/$DTDVERSION" \ |
114 |
- "file:///usr/share/xml/docbook/xml-dtd-4.5" \ |
|
114 |
+ "file:///usr/share/xml/docbook/docbook-xml-4.5" \ |
|
115 | 115 |
/etc/xml/docbook |
116 | 116 |
xmlcatalog --noout --add "rewriteURI" \ |
117 | 117 |
"http://www.oasis-open.org/docbook/xml/$DTDVERSION" \ |
118 |
- "file:///usr/share/xml/docbook/xml-dtd-4.5" \ |
|
118 |
+ "file:///usr/share/xml/docbook/docbook-xml-4.5" \ |
|
119 | 119 |
/etc/xml/docbook |
120 | 120 |
xmlcatalog --noout --add "delegateSystem" \ |
121 | 121 |
"http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \ |
... | ... |
@@ -134,6 +134,8 @@ rm /etc/xml/docbook |
134 | 134 |
/usr/share/xml/docbook/%{name}-%{version} |
135 | 135 |
/etc/xml |
136 | 136 |
%changelog |
137 |
+* Thu Mar 10 2016 XIaolin Li <xiaolinl@vmware.com> 4.5.1-4 |
|
138 |
+- Correct the local folder name. |
|
137 | 139 |
* Mon Jul 6 2015 Mahmoud Bassiouny <mbassiouny@vmware.com> 4.5.1-3 |
138 | 140 |
- Updated dependencies. |
139 | 141 |
* Wed May 20 2015 Touseef Liaqat <tliaqat@vmware.com> 4.5.1-2 |
... | ... |
@@ -1,7 +1,7 @@ |
1 | 1 |
Summary: Systemd-228 |
2 | 2 |
Name: systemd |
3 | 3 |
Version: 228 |
4 |
-Release: 8%{?dist} |
|
4 |
+Release: 9%{?dist} |
|
5 | 5 |
License: LGPLv2+ and GPLv2+ and MIT |
6 | 6 |
URL: http://www.freedesktop.org/wiki/Software/systemd/ |
7 | 7 |
Group: System Environment/Security |
... | ... |
@@ -32,6 +32,9 @@ BuildRequires: XML-Parser |
32 | 32 |
BuildRequires: kbd |
33 | 33 |
BuildRequires: kmod |
34 | 34 |
BuildRequires: util-linux-devel |
35 |
+BuildRequires: libxslt |
|
36 |
+BuildRequires: docbook-xsl |
|
37 |
+BuildRequires: docbook-xml |
|
35 | 38 |
Requires: kmod |
36 | 39 |
BuildRequires: glib-devel |
37 | 40 |
Requires: glib |
... | ... |
@@ -71,7 +74,6 @@ sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h") |
71 | 71 |
--disable-ldconfig \ |
72 | 72 |
--disable-sysusers \ |
73 | 73 |
--without-python \ |
74 |
- --disable-manpages \ |
|
75 | 74 |
--enable-pam \ |
76 | 75 |
--docdir=%{_prefix}/share/doc/systemd-228 \ |
77 | 76 |
--with-dbuspolicydir=/etc/dbus-1/system.d \ |
... | ... |
@@ -121,6 +123,8 @@ rm -rf %{buildroot}/* |
121 | 121 |
|
122 | 122 |
|
123 | 123 |
%changelog |
124 |
+* Thu Mar 10 2016 XIaolin Li <xiaolinl@vmware.com> 228-9 |
|
125 |
+- Enable manpages. |
|
124 | 126 |
* Fri Feb 19 2016 Anish Swaminathan <anishs@vmware.com> 228-8 |
125 | 127 |
- Added patch to get around systemd-networkd wait online timeout |
126 | 128 |
* Sat Feb 06 2016 Alexey Makhalov <amakhalov@vmware.com> 228-7 |