compatible with createrepo package

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

diff --git a/VERSION.cmake b/VERSION.cmake
index aae157332bacf63e0598db3da9066758937fddfb..eb639415ee93217779a4ba19ca7f8f40bbf6455b 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,3 +1,3 @@
 SET(CR_MAJOR "0")
 SET(CR_MINOR "10")
-SET(CR_PATCH "0")
+SET(CR_PATCH "2")

diff --git a/debian/control b/debian/control
index 294340855ab90a65b4b6c4166321b52ac71b24d1..1015273eda49406d9e758042d2a1283ccd04bb75 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: extra
 Maintainer: Jian-feng Ding <jian-feng.ding@intel.com>
 Build-Depends: debhelper (>= 7.0.15), cdbs, libpython2.7, python-dev, dh-python, python-docutils, cmake, dpatch, libbz2-dev, librpm-dev, liblzma-dev, libcurl3 | libcurl4, libcurl4-openssl-dev, libmagic-dev, libexpat1, doxygen, pkg-config, libglib2.0-dev, libssl-dev
-Standards-Version: 0.10.0
+Standards-Version: 0.10.2
 Homepage: http://www.tizen.org
 
 Package: createrepo-c
@@ -32,9 +32,21 @@ Depends:  ${python:Depends},
  python-urlgrabber,
  cpio,
  bzip2,
- createrepo-c,
- createrepo-c-devel,
- createrepo,
+ libcreaterepo-c,
  gzip
 Description: image creator for Linux distributions
   The tool createrep is used to ppfarm test
+
+Package: libcreaterepo-c
+Architecture: i386 amd64
+Depends:  ${python: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
+

diff --git a/debian/createrepo-c.install b/debian/createrepo-c.install
index c64f72e69709f5903180efe27d48d61896b38745..fdc85a74ca3808f4e9a11e27e6551650e651a96c 100644 (file)
--- a/debian/createrepo-c.install
+++ b/debian/createrepo-c.install
@@ -1,7 +1,10 @@
 etc/bash_completion.d /etc/
+usr/bin/createrepo /usr/bin/
 usr/bin/createrepo_c /usr/bin/
+usr/bin/mergerepo /usr/bin/
 usr/bin/mergerepo_c /usr/bin/
+usr/bin/modifyrepo /usr/bin/
 usr/bin/modifyrepo_c /usr/bin/
+usr/bin/sqliterepo /usr/bin/
 usr/bin/sqliterepo_c /usr/bin/
-usr/lib/libcreaterepo_c.so.* /usr/lib/
 usr/share/man/man8 /usr/share/man/

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

diff --git a/debian/rules b/debian/rules
index fc6756360ac047ac54577c7da35bf1e7b8c239d5..259d2a0a289f45f938f8442f2fd0902e1c25bb5c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,12 @@ install: build
 
        # Installing package
        make DESTDIR=$(CURDIR) sysconfdir=$(CURDIR)/etc install
-       if [ -e usr/lib64 ]; then cp -arf  usr/lib64/* usr/lib/; fi     
+       if [ -e usr/lib64 ]; then cp -arf  usr/lib64/* usr/lib/; fi
+       #To compatible with createrepo
+       for i in createrepo mergerepo modifyrepo sqliterepo;do \
+               ln -s /usr/bin/$$i\_c $(CURDIR)/usr/bin/$$i; \
+               echo ".so man8/$$i\_c.8" > $(CURDIR)/usr/share/man/man8/$$i\.8; \
+       done
 #      cat src/python/__init__.py
 #      ls -R
 binary-indep: build install

diff --git a/packaging/createrepo_c.spec b/packaging/createrepo_c.spec
index d6972285289f3cbc0e4f39b9587de7329c018e06..328a1092adfa586a3db98830b11d5a471d5775d1 100644 (file)
--- a/packaging/createrepo_c.spec
+++ b/packaging/createrepo_c.spec
@@ -18,12 +18,17 @@ C language implemention of createrepo
 
 %package devel
 Summary:        Devel package of createrepo_c
-Requires:       createrepo_c = %{version}
-Requires:       createrepo
+Requires:       libcreaterepo_c0 = %{version}
 
 %description devel
 Devel package C language implemention of createrepo
 
+%package -n libcreaterepo_c0
+Summary:        Library package of createrepo_c
+
+%description -n libcreaterepo_c0
+Library package C language implemention of createrepo
+
 
 %prep
 %setup -q
@@ -41,6 +46,13 @@ cmake -DCMAKE_SKIP_RPATH=ON \
 
 %install
 make DESTDIR=%{buildroot} sysconfdir=%{_sysconfdir} install
+for i in createrepo mergerepo modifyrepo sqliterepo;do
+  ln -s  %{_bindir}/$i\_c %{buildroot}%{_bindir}/$i
+  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
 
 %files
 %defattr(-, root, root,-)
@@ -49,7 +61,10 @@ make DESTDIR=%{buildroot} sysconfdir=%{_sysconfdir} install
 %{_bindir}/modifyrepo_c
 %{_bindir}/sqliterepo_c
 %{_bindir}/mergerepo_c
-%{_libdir}/libcreaterepo_c.so.*
+%{_bindir}/createrepo
+%{_bindir}/mergerepo
+%{_bindir}/modifyrepo
+%{_bindir}/sqliterepo
 %{_mandir}/*/*
 
 %files devel
@@ -59,5 +74,8 @@ make DESTDIR=%{buildroot} sysconfdir=%{_sysconfdir} install
 %{_includedir}/createrepo_c
 %{python_sitearch}/createrepo_c
 
+%files -n libcreaterepo_c0
+%defattr(-, root, root,-)
+%{_libdir}/libcreaterepo_c.so.*
 
 %changelog