Fixed package groups

diff --git a/packaging/libxml2.changes b/packaging/libxml2.changes
new file mode 100644 (file)
index 0000000..c47f013
--- /dev/null
+++ b/packaging/libxml2.changes
@@ -0,0 +1,3 @@
+* Mon Mar 18 2013 Anas Nashif <anas.nashif@intel.com> upstream/2.8.0@a14fbb2
+- Fixed package groups
+

diff --git a/packaging/libxml2.spec b/packaging/libxml2.spec
index ea441b8..611bbac 100644 (file)
--- a/packaging/libxml2.spec
+++ b/packaging/libxml2.spec
@@ -1,5 +1,3 @@
-%define lname libxml2
-

 Name:           libxml2
 Version:        2.8.0
 Release:        0
 Name:           libxml2
 Version:        2.8.0
 Release:        0


@@ -10,7 +8,6 @@ Url:            http://xmlsoft.org
 # Source ftp://xmlsoft.org/libxml2/libxml2-git-snapshot.tar.gz changes every day
 Source:         ftp://xmlsoft.org/libxml2/%{name}-%{version}.tar.gz
 Source2:        baselibs.conf
 # Source ftp://xmlsoft.org/libxml2/libxml2-git-snapshot.tar.gz changes every day
 Source:         ftp://xmlsoft.org/libxml2/%{name}-%{version}.tar.gz
 Source2:        baselibs.conf

-Patch0:         fix-perl.diff

 BuildRequires:  pkg-config
 BuildRequires:  readline-devel
 BuildRequires:  xz-devel
 BuildRequires:  pkg-config
 BuildRequires:  readline-devel
 BuildRequires:  xz-devel


@@ -42,8 +39,8 @@ This package contains xmllint, a very useful tool proving libxml's power.
 
 %package devel
 Summary:        Include Files and Libraries mandatory for Development
 
 %package devel
 Summary:        Include Files and Libraries mandatory for Development

-Group:          Development/Libraries/C and C++
-Requires:       %{lname} = %{version}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}

 Requires:       %{name}-tools = %{version}
 Requires:       glibc-devel
 Requires:       readline-devel
 Requires:       %{name}-tools = %{version}
 Requires:       glibc-devel
 Requires:       readline-devel


@@ -54,31 +51,8 @@ Requires:       zlib-devel
 This package contains all necessary include files and libraries needed
 to develop applications that require these.
 
 This package contains all necessary include files and libraries needed
 to develop applications that require these.
 

-%package doc
-Summary:        A Library to Manipulate XML Files
-Group:          System/Libraries
-Requires:       %{lname} = %{version}
-BuildArch:      noarch
-
-%description doc
-The XML C library was initially developed for the GNOME project. It is
-now used by many programs to load and save extensible data structures
-or manipulate any kind of XML files.
-
-This library implements a number of existing standards related to
-markup languages, including the XML standard, name spaces in XML, XML
-Base, RFC 2396, XPath, XPointer, HTML4, XInclude, SGML catalogs, and
-XML catalogs. In most cases, libxml tries to implement the
-specification in a rather strict way. To some extent, it provides
-support for the following specifications, but does not claim to
-implement them: DOM, FTP client, HTTP client, and SAX.
-
-The library also supports RelaxNG. Support for W3C XML Schemas is in
-progress.
-

 %prep
 %setup -q
 %prep
 %setup -q

-%patch0

 
 %build
 %configure --disable-static \
 
 %build
 %configure --disable-static \


@@ -104,10 +78,9 @@ make check
 
 %install
 make install DESTDIR="%buildroot" BASE_DIR="%_docdir" DOC_MODULE="%name"
 
 %install
 make install DESTDIR="%buildroot" BASE_DIR="%_docdir" DOC_MODULE="%name"

-mkdir -p "%buildroot/%_docdir/%name"
-cp -a AUTHORS NEWS README COPYING* Copyright TODO* %{buildroot}%{_docdir}/%{name}/

 ln -s libxml2/libxml %{buildroot}%{_includedir}/libxml
 
 ln -s libxml2/libxml %{buildroot}%{_includedir}/libxml
 

+%remove_docs

 
 %post -p /sbin/ldconfig
 
 
 %post -p /sbin/ldconfig
 


@@ -115,16 +88,13 @@ ln -s libxml2/libxml %{buildroot}%{_includedir}/libxml
 
 %files 
 %defattr(-, root, root)
 
 %files 
 %defattr(-, root, root)

+%license COPYING*

 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.so.*

-%doc %dir %{_docdir}/%{name}
-%doc %{_docdir}/%{name}/[ANRCT]*

 
 %files tools
 %defattr(-, root, root)
 %{_bindir}/xmllint
 %{_bindir}/xmlcatalog
 
 %files tools
 %defattr(-, root, root)
 %{_bindir}/xmllint
 %{_bindir}/xmlcatalog

-%doc %{_mandir}/man1/xmllint.1*
-%doc %{_mandir}/man1/xmlcatalog.1*

 
 %files devel
 %defattr(-, root, root)
 
 %files devel
 %defattr(-, root, root)


@@ -138,16 +108,5 @@ ln -s libxml2/libxml %{buildroot}%{_includedir}/libxml
 %{_libdir}/libxml2.la
 %{_libdir}/*.sh
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/libxml2.la
 %{_libdir}/*.sh
 %{_libdir}/pkgconfig/*.pc

-%doc %{_mandir}/man1/xml2-config.1*
-%doc %{_mandir}/man3/libxml.3*
-
-%files doc
-%defattr(-, root, root)
-%{_datadir}/gtk-doc/html/*
-%doc %{_docdir}/%{name}/examples
-%doc %{_docdir}/%{name}/html
-# owning these directories prevents gtk-doc <-> libxml2 build loop:
-%dir %{_datadir}/gtk-doc
-%dir %{_datadir}/gtk-doc/html

 
 %changelog
 
 %changelog

diff --git a/packaging/python-libxml2.spec b/packaging/python-libxml2.spec
index 970dac1..88c5198 100644 (file)
--- a/packaging/python-libxml2.spec
+++ b/packaging/python-libxml2.spec
@@ -3,7 +3,7 @@ Version:        2.8.0
 Release:        0
 Summary:        Python Bindings for libxml2
 License:        MIT
 Release:        0
 Summary:        Python Bindings for libxml2
 License:        MIT

-Group:          Development/Libraries/Python
+Group:          Platform Development/Python

 Url:            http://xmlsoft.org
 Source:         ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://xmlsoft.org
 Source:         ftp://xmlsoft.org/libxml2/libxml2-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build


@@ -58,7 +58,6 @@ rm -f %{buildroot}%{py_sitedir}/*.{la,a}
 
 %files
 %defattr(-, root, root)
 
 %files
 %defattr(-, root, root)

-%doc python/TODO

 %doc python/libxml2class.txt
 %doc python/tests
 %{py_sitedir}/*
 %doc python/libxml2class.txt
 %doc python/tests
 %{py_sitedir}/*