summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSung-jae Park <nicesj.park@samsung.com>2014-04-30 15:05:41 +0900
committerSung-jae Park <nicesj.park@samsung.com>2014-04-30 15:07:49 +0900
commit824c9958c93a345ddac998f6ec0d458e7d49bda4 (patch)
treeb916fabc99ee9a73bdaec1d33d251a2d5cff859c
parent11cfeaaab5a06bd43a6cf8e4c93eeb0fc63ea669 (diff)
downloadbadge-824c9958c93a345ddac998f6ec0d458e7d49bda4.tar.gz
badge-824c9958c93a345ddac998f6ec0d458e7d49bda4.tar.bz2
badge-824c9958c93a345ddac998f6ec0d458e7d49bda4.zip
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
-rw-r--r--[-rwxr-xr-x]badge-service.pc.in2
-rw-r--r--packaging/libbadge.changes (renamed from packaging/badge.changes)0
-rw-r--r--packaging/libbadge.manifest (renamed from packaging/badge.manifest)0
-rwxr-xr-xpackaging/libbadge.spec (renamed from packaging/badge.spec)45
4 files changed, 20 insertions, 27 deletions
diff --git a/badge-service.pc.in b/badge-service.pc.in
index 7864b50..e9c9001 100755..100644
--- 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
index 99c4a1e..99c4a1e 100644
--- a/packaging/badge.changes
+++ b/packaging/libbadge.changes
diff --git a/packaging/badge.manifest b/packaging/libbadge.manifest
index 017d22d..017d22d 100644
--- a/packaging/badge.manifest
+++ b/packaging/libbadge.manifest
diff --git a/packaging/badge.spec b/packaging/libbadge.spec
index 1fd22ee..cc96db8 100755
--- 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