From 7045dc4cdca3f8d7d7980e68b470f51da4fe21a2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?K=C3=A9vin=20THIERRY?= Date: Mon, 7 Jul 2014 11:09:42 +0200 Subject: [PATCH] Remove unused LIB_DL in CMakeLists.txt MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Also clean spec file. Change-Id: If65141d0f8d1a7840b33171d63f6cb6eec78fb69 Signed-off-by: Kévin THIERRY --- CMakeLists.txt | 2 -- packaging/app-svc.spec | 58 ++++++++++++++++++++++---------------------------- 2 files changed, 26 insertions(+), 34 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b2900c..a31ccc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,8 +36,6 @@ pkg_check_modules(pkgs REQUIRED ${APPSVC_PKGS_CHECK_MODULES}) pkg_check_modules(libpkgs REQUIRED ${APPSVC_LIBPKGS_CHECK_MODULES}) ENDIF (with_wayland) -FIND_LIBRARY(LIB_DL dl) - FOREACH(flag ${libpkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) diff --git a/packaging/app-svc.spec b/packaging/app-svc.spec index 7ffb0ca..a298e7c 100644 --- a/packaging/app-svc.spec +++ b/packaging/app-svc.spec @@ -1,36 +1,36 @@ %bcond_with x %bcond_with wayland -Name: app-svc +Name: app-svc Summary: Application Service -Version: 0.1.53 -Release: 1 +Version: 0.1.53 +Release: 0 Group: Application Framework/Service License: Apache-2.0 Source0: %{name}-%{version}.tar.gz -Source1001: app-svc.manifest - -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -BuildRequires: cmake -BuildRequires: sqlite3 -BuildRequires: pkgconfig(dlog) -BuildRequires: pkgconfig(ecore) +Source1001: app-svc.manifest + +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +BuildRequires: cmake +BuildRequires: sqlite3 +BuildRequires: pkgconfig(dlog) +BuildRequires: pkgconfig(ecore) %if %{with x} -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(ecore-x) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(ecore-x) %endif -BuildRequires: pkgconfig(libprivilege-control) -BuildRequires: pkgconfig(bundle) -BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(ail) -BuildRequires: pkgconfig(xdgmime) -BuildRequires: pkgconfig(aul) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(libsoup-2.4) -BuildRequires: pkgconfig(iniparser) -BuildRequires: pkgconfig(pkgmgr-info) -BuildRequires: pkgconfig(libtzplatform-config) +BuildRequires: pkgconfig(libprivilege-control) +BuildRequires: pkgconfig(bundle) +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(ail) +BuildRequires: pkgconfig(xdgmime) +BuildRequires: pkgconfig(aul) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: pkgconfig(iniparser) +BuildRequires: pkgconfig(pkgmgr-info) +BuildRequires: pkgconfig(libtzplatform-config) %description @@ -56,7 +56,7 @@ cp %{SOURCE1001} . -Dwith_x=TRUE %endif -make %{?jobs:-j%jobs} +%__make %{?jobs:-j%jobs} %install %make_install @@ -65,9 +65,6 @@ make %{?jobs:-j%jobs} mkdir -p %{buildroot}%{TZ_SYS_DB} sqlite3 %{buildroot}%{TZ_SYS_DB}/.appsvc.db < data/appsvc_db.sql -mkdir -p %{buildroot}/usr/share/license -cp LICENSE %{buildroot}/usr/share/license/%{name} - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -78,10 +75,9 @@ cp LICENSE %{buildroot}/usr/share/license/%{name} %license LICENSE %config(noreplace) %verify(not md5 mtime size) %attr(664,root,%{TZ_SYS_USER_GROUP}) %{TZ_SYS_DB}/.appsvc.db %config(noreplace) %verify(not md5 mtime size) %attr(664,root,%{TZ_SYS_USER_GROUP}) %{TZ_SYS_DB}/.appsvc.db-journal -/usr/bin/appsvc_test +%{_bindir}/appsvc_test %{_libdir}/libappsvc.so.0 %{_libdir}/libappsvc.so.0.1.0 -/usr/share/license/%{name} %files devel %defattr(-,root,root,-) @@ -89,5 +85,3 @@ cp LICENSE %{buildroot}/usr/share/license/%{name} %{_libdir}/pkgconfig/appsvc.pc %{_libdir}/libappsvc.so %{_includedir}/appsvc/appsvc.h - - -- 2.7.4