Refine code not to insatall unnecessary packages

Change-Id: I0081b1e8a35d582b11436492c8efeea296922bc9
Signed-off-by: biao716.wang <biao716.wang@samsung.com>

diff --git a/debian/control b/debian/control
index 1c8adb6482138c06c0a3a85d5f2a38ab5df0882e..8a04a5bdcd0b1c31f7cb2accc2b310bca820b4c0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,46 +7,72 @@ Standards-Version: 0.17.4
 Homepage: http://www.tizen.org
 
 Package: createrepo-c
-Architecture: i386 amd64
-Depends:  ${python3:Depends},
- rpm,
- python3-rpm,
- python3-urlgrabber,
- cpio,
- bzip2,
- libpython3-dev,
- libcurl3 | libcurl4,
- libxml2,
- gzip,
- createrepo-c-devel (= ${binary:Version}),
- libglib2.0-0,
- libglib2.0-data
-Description: image creator for Linux distributions
-  The tool createrep is used to ppfarm test
+Architecture: any
+Depends:
+ libcreaterepo-c0 (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Multi-Arch: foreign
+Description: tool to create RPM repository metadata (C implementation)
+ The createrepo_c tool generates the repodata directory and XML metadata that
+ makes up a repository of RPM packages. This repository format is supported
+ by apt-rpm, red-carpet(zen), smartpm, up2date, yast, and yum.
+ .
+ This package is similar to the apt-ftparchive or reprepro commands, but for
+ working with RPM repositories.
 
-Package: createrepo-c-devel
-Architecture: i386 amd64
-Depends:  ${python3:Depends},
- rpm,
- python3-rpm,
- python3-urlgrabber,
- cpio,
- bzip2,
- libcreaterepo-c,
- gzip
-Description: image creator for Linux distributions
-  The tool createrep is used to ppfarm test
+Package: libcreaterepo-c0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Description: library for creating RPM repository metadata
+ The createrepo tool generates the repodata directory and XML metadata that
+ makes up a repository of RPM packages. This repository format is supported
+ by apt-rpm, red-carpet(zen), smartpm, up2date, yast, and yum.
+ .
+ This package contains a shared library for managing RPM repositories.
 
-Package: libcreaterepo-c
-Architecture: i386 amd64
-Depends:  ${python3:Depends},
- cpio,
- bzip2,
- libcurl3 | libcurl4,
- libxml2,
- gzip,
- libglib2.0-0,
- libglib2.0-data
-Description: image creator for Linux distributions
-  The tool createrep is used to ppfarm test
+Package: libcreaterepo-c-dev
+Section: libdevel
+Architecture: any
+Depends:
+ libcreaterepo-c0 (= ${binary:Version}),
+ libbz2-dev,
+ libcurl4-openssl-dev,
+ libglib2.0-dev,
+ liblzma-dev,
+ libmagic-dev,
+ libpython3-dev,
+ librpm-dev,
+ libssl-dev,
+ libsqlite3-dev,
+ libxml2-dev,
+ python3-nose,
+ zlib1g-dev,
+ ${misc:Depends}
+Multi-Arch: same
+Description: library for creating RPM repository metadata (development)
+ The createrepo tool generates the repodata directory and XML metadata that
+ makes up a repository of RPM packages. This repository format is supported
+ by apt-rpm, red-carpet(zen), smartpm, up2date, yast, and yum.
+ .
+ This package contains the header files needed for developing programs
+ using the libcreaterepo-c library.
 
+Package: python3-createrepo-c
+Section: python
+Architecture: any
+Depends:
+ libcreaterepo-c0 (= ${binary:Version}),
+ ${python3:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Multi-Arch: foreign
+Description: library for creating RPM repository metadata (Python bindings)
+ The createrepo tool generates the repodata directory and XML metadata that
+ makes up a repository of RPM packages. This repository format is supported
+ by apt-rpm, red-carpet(zen), smartpm, up2date, yast, and yum.
+ .
+ This package contains a Python module for interfacing with
+ the libcreaterepo-c library.

diff --git a/debian/createrepo-c-devel.install b/debian/createrepo-c-devel.install
deleted file mode 100644 (file)
index 95c6a59..0000000
--- a/debian/createrepo-c-devel.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include/createrepo_c /usr/include/
-usr/lib/libcreaterepo_c.so /usr/lib/
-usr/lib/pkgconfig/createrepo_c.pc /usr/lib/pkgconfig/
-usr/lib/python3/dist-packages/createrepo_c /usr/lib/python3/dist-packages/
-

diff --git a/debian/libcreaterepo-c-dev.install b/debian/libcreaterepo-c-dev.install
new file mode 100644 (file)
index 0000000..95c6a59
--- /dev/null
+++ b/debian/libcreaterepo-c-dev.install
@@ -0,0 +1,5 @@
+usr/include/createrepo_c /usr/include/
+usr/lib/libcreaterepo_c.so /usr/lib/
+usr/lib/pkgconfig/createrepo_c.pc /usr/lib/pkgconfig/
+usr/lib/python3/dist-packages/createrepo_c /usr/lib/python3/dist-packages/
+

diff --git a/debian/libcreaterepo-c.install b/debian/libcreaterepo-c.install
deleted file mode 100644 (file)
index fde0753..0000000
--- a/debian/libcreaterepo-c.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libcreaterepo_c.so.* /usr/lib/

diff --git a/debian/libcreaterepo-c0.install b/debian/libcreaterepo-c0.install
new file mode 100644 (file)
index 0000000..fde0753
--- /dev/null
+++ b/debian/libcreaterepo-c0.install
@@ -0,0 +1 @@
+usr/lib/libcreaterepo_c.so.* /usr/lib/

diff --git a/debian/python3-createrepo-c.install b/debian/python3-createrepo-c.install
new file mode 100644 (file)
index 0000000..6e0a879
--- /dev/null
+++ b/debian/python3-createrepo-c.install
@@ -0,0 +1 @@
+usr/lib/python3/dist-packages/createrepo_c

diff --git a/packaging/createrepo_c.spec b/packaging/createrepo_c.spec
index 0d6fe18c1b256a82e247c71ac278a1fb17226491..023fc719dad8cc3f322bfe1a19f61c91e3a477d5 100644 (file)
--- a/packaging/createrepo_c.spec
+++ b/packaging/createrepo_c.spec
@@ -1,3 +1,7 @@
+%define major 0
+%define libname lib%{name}%{major}
+%define devname lib%{name}-devel
+
 Name:           createrepo_c
 Version:        0.17.4
 Release:        1
@@ -11,24 +15,34 @@ BuildRequires:  libcurl-devel libxml2-devel python3-devel gcc-c++
 BuildRequires:  rpm-devel openssl-devel sqlite-devel doxygen
 BuildRequires:  glib2-devel xz-devel
 
-Requires: createrepo_c-devel = %{version}
+Requires: %{libname} = %{version}-%{release}
 
 %description
 C language implemention of createrepo
 
-%package devel
+%package -n %{devname}
 Summary:        Devel package of createrepo_c
-Requires:       libcreaterepo_c0 = %{version}
+Provides:       %{devname} = %{version}-%{release}
+Requires:       %{libname} = %{version}-%{release}
 
-%description devel
+%description -n %{devname}
 Devel package C language implemention of createrepo
 
-%package -n libcreaterepo_c0
+%package -n %{libname}
 Summary:        Library package of createrepo_c
 
-%description -n libcreaterepo_c0
+%description -n %{libname}
 Library package C language implemention of createrepo
 
+%package -n python3-%{name}
+Summary:        Python 3 bindings for the createrepo_c library
+Requires:       %{libname}%{?_isa} = %{version}-%{release}
+# Python 2 subpackage is fully dropped
+Obsoletes:      python2-%{name} < 0.12.0
+
+%description -n python3-%{name}
+The Python 3 bindings for the createrepo_c library.
+
 
 %prep
 %setup -q
@@ -51,8 +65,8 @@ for i in createrepo mergerepo modifyrepo sqliterepo;do
   echo ".so man8/$i\_c.8" > %{buildroot}%{_mandir}/man8/$i\.8
 done
 
-%post -n libcreaterepo_c0 -p /sbin/ldconfig
-%postun -n libcreaterepo_c0 -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
 
 %files
 %defattr(-, root, root,-)
@@ -67,15 +81,17 @@ done
 %{_bindir}/sqliterepo
 %{_mandir}/*/*
 
-%files devel
+%files -n %{devname}
 %defattr(-, root, root,-)
 %{_libdir}/libcreaterepo_c.so
 %{_libdir}/pkgconfig/createrepo_c.pc
 %{_includedir}/createrepo_c
-%{python3_sitearch}/createrepo_c
 
-%files -n libcreaterepo_c0
+%files -n %{libname}
 %defattr(-, root, root,-)
 %{_libdir}/libcreaterepo_c.so.*
 
+%files -n python3-%{name}
+%{python3_sitearch}/createrepo_c/
+
 %changelog