Update spec file.

Creating libbadge*.rpm file.
previously, this project generates badge*.rpm and libbadge*.rpm.

This patch will fix them to generates rpm files named with libbadge*.rpm style.

Change-Id: I0686887a2f027089d30257af12962a3aff8eea70

diff --git a/badge-service.pc.in b/badge-service.pc.in
old mode 100755 (executable)
new mode 100644 (file)
index 7864b50..e9c9001
--- a/badge-service.pc.in
+++ b/badge-service.pc.in
@@ -3,7 +3,7 @@ exec_prefix=@EXEC_PREFIX@
 libdir=@LIBDIR@
 includedir=@INCLUDEDIR@/service
 
-Name: badge
+Name: badge-service
 Description: Badge supporting library
 Version: @VERSION@
 Requires:

diff --git a/packaging/badge.changes b/packaging/libbadge.changes
similarity index 100%
rename from packaging/badge.changes
rename to packaging/libbadge.changes

diff --git a/packaging/badge.manifest b/packaging/libbadge.manifest
similarity index 100%
rename from packaging/badge.manifest
rename to packaging/libbadge.manifest

diff --git a/packaging/badge.spec b/packaging/libbadge.spec
similarity index 63%
rename from packaging/badge.spec
rename to packaging/libbadge.spec
index 1fd22ee..cc96db8 100755 (executable)
--- a/packaging/badge.spec
+++ b/packaging/libbadge.spec
@@ -1,11 +1,11 @@
-Name:       badge
+Name:       libbadge
 Summary:    Badge library
 Version:    0.0.5
 Release:    0
 Group:      Application Framework/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1001: badge.manifest
+Source1001: %{name}.manifest
 Source1002: init_db.sh
 BuildRequires: pkgconfig(aul)
 BuildRequires: pkgconfig(dbus-1)
@@ -20,40 +20,34 @@ BuildRequires: cmake
 %description
 Badge library.
 
-%package -n libbadge
-Summary:    Badge Library
-
-%description -n libbadge
-Badge library.
-
-%prep
-%setup -q
-cp %{SOURCE1001} .
-
 %package devel
-Summary:    Badge library (devel)
-Group:      Application Framework/Development
-Requires:   libbadge = %{version}-%{release}
+Summary: Badge library (devel)
+Group: Application Framework/Development
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 Development files needed to build software that needs to system a system badge.
 
 %package service-devel
-Summary:    Badge library (service-devel)
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
+Summary: Badge service library (service-devel)
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 
 %description service-devel
 Development files needed to build badge service
 
+%prep
+%setup -q
+cp %{SOURCE1001} .
+
 %build
-%cmake . 
+%cmake .
 make %{?jobs:-j%jobs}
 
 %install
 %make_install
-install -D -m 0640 %{name}.sql %{buildroot}%{TZ_SYS_SHARE}/%{name}/ressources/%{name}.sql
-install -D -m 0750 %{SOURCE1002} %{buildroot}%{TZ_SYS_SHARE}/%{name}/ressources/init_db.sh
+install -D -m 0640 badge.sql %{buildroot}%{TZ_SYS_SHARE}/badge/ressources/badge.sql
+install -D -m 0750 %{SOURCE1002} %{buildroot}%{TZ_SYS_SHARE}/badge/ressources/init_db.sh
 
 %post  -p /sbin/ldconfig -n libbadge
 
@@ -62,12 +56,11 @@ install -D -m 0750 %{SOURCE1002} %{buildroot}%{TZ_SYS_SHARE}/%{name}/ressources/
 %files -n libbadge
 %manifest %{name}.manifest
 %license LICENSE.APLv2.0
-%manifest badge.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libbadge.so.*
-%{TZ_SYS_SHARE}/%{name}
-%attr(640,root,%{TZ_SYS_USER_GROUP}) %{TZ_SYS_SHARE}/%{name}/ressources/%{name}.sql
-%attr(750,root,%{TZ_SYS_USER_GROUP}) %{TZ_SYS_SHARE}/%{name}/ressources/init_db.sh
+%{TZ_SYS_SHARE}/badge
+%attr(640,root,%{TZ_SYS_USER_GROUP}) %{TZ_SYS_SHARE}/badge/ressources/badge.sql
+%attr(750,root,%{TZ_SYS_USER_GROUP}) %{TZ_SYS_SHARE}/badge/ressources/init_db.sh
 
 %files devel
 %manifest %{name}.manifest
@@ -76,7 +69,7 @@ install -D -m 0750 %{SOURCE1002} %{buildroot}%{TZ_SYS_SHARE}/%{name}/ressources/
 %{_includedir}/badge/badge_error.h
 %{_includedir}/badge/badge_setting.h
 %{_libdir}/libbadge.so
-%{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/pkgconfig/badge.pc
 
 %files service-devel
 %manifest %{name}.manifest