clean %post and use SYSCONFDIR

- remove obsolete debian directory

Change-Id: Ic5d45ae16b5cdd149f1f1509b0fc480045369d02
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 33841ef..0f6517d
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,7 @@ PROJECT(pkgmgr-info C)
 
 SET(VERSION 0.0.17)
 SET(VERSION_MAJOR 0)
+INCLUDE(TizenCommon)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
@@ -59,4 +60,4 @@ configure_file(pkgmgr-parser.manifest.in pkgmgr-parser.manifest @ONLY)
 INSTALL(TARGETS pkgmgr-info DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgmgr-info.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/pkgmgr-info.h DESTINATION include)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/parser_path.conf DESTINATION ${PREFIX}/etc/package-manager/)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/parser_path.conf DESTINATION ${SYSCONFDIR}/package-manager/)

diff --git a/debian/changelog b/debian/changelog
deleted file mode 100755 (executable)
index ef8ebf6..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,8 +0,0 @@
-pkgmgr-info (0.2.1) unstable; urgency=low
-
-  * Initial release
-  * Git: slp/pkgs/a/pkgmgr-info
-  * Tag: pkgmgr-info_0.2.1
-
- -- Jaeho Lee <jaeho81.lee@samsung.com>  Thu, 24 May 2012 12:04:51 +0530
-

diff --git a/debian/compat b/debian/compat
deleted file mode 100755 (executable)
index 7ed6ff8..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/debian/control b/debian/control
deleted file mode 100755 (executable)
index 60bd677..0000000
--- a/debian/control
+++ /dev/null
@@ -1,27 +0,0 @@
-Source: pkgmgr-info
-Section: devel
-Priority: extra
-Maintainer: Garima Shrivastava <garima.s@samsung.com>, Jaeho Lee <jaeho81.lee@samsung.com>
-Build-Depends: debhelper (>= 5),libssl-dev, libslp-setting-dev, libslp-db-util-dev
-Standards-Version: 3.7.2
-
-Package: pkgmgr-info
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: <App2sd is a utility for enabling installation of applications to sd card and also to move to and from sd card.>
-
-Package: pkgmgr-info-dev
-Architecture: any
-Depends: app2sd (= ${Source-Version})
-Description: App2sd dev package
-
-Package: pkgmgr-info-doc
-Architecture: all
-Description: <App2sd is a utility for enabling installation of applications to sd card and also to move to and from sd card.>
-
-Package: pkgmgr-info-dbg
-Section: debug
-Architecture: any
-Depends: pkgmgr-info (= ${Source-Version})
-Description: pkgmgr-info dbg package
-

diff --git a/debian/copyright b/debian/copyright
deleted file mode 100755 (executable)
index 37b94ac..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2012 - 2013 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */

diff --git a/debian/dirs b/debian/dirs
deleted file mode 100755 (executable)
index ca882bb..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin

diff --git a/debian/pkgmgr-info-dev.install.in b/debian/pkgmgr-info-dev.install.in
deleted file mode 100755 (executable)
index 7920b49..0000000
--- a/debian/pkgmgr-info-dev.install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-@PREFIX@/include/pkgmgr-info.h
-@PREFIX@/lib/pkgconfig/*.pc

diff --git a/debian/pkgmgr-info.install.in b/debian/pkgmgr-info.install.in
deleted file mode 100755 (executable)
index bf766f0..0000000
--- a/debian/pkgmgr-info.install.in
+++ /dev/null
@@ -1 +0,0 @@
-@PREFIX@/lib/*.so*

diff --git a/debian/rules b/debian/rules
deleted file mode 100755 (executable)
index f902937..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_GNU_OS)
-
-CFLAGS ?= -Wall -g
-LDFLAGS ?=
-PREFIX ?= /usr
-DATADIR ?= /opt
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
-
-# architecture is not arm
-ifneq (, $(findstring arm, $(DEB_HOST_ARCH)))
-       # do something here
-else
-       # do something here for arm
-endif
-
-CFLAGS += -fvisibility=hidden -fPIC
-LDFLAGS += -Wl,--rpath=$(PREFIX)/lib -Wl,--as-needed
-
-CMAKE_TMP_DIR = $(CURDIR)/cmake_tmp
-
-config.status:
-
-configure: configure-stamp
-
-configure-stamp:
-       dh_testdir
-       mkdir -p $(CMAKE_TMP_DIR);
-       export LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(CMAKE_TMP_DIR) && cd $(CMAKE_TMP_DIR); CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" cmake .. -DCMAKE_INSTALL_PREFIX=$(PREFIX)
-       touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp
-       dh_testdir
-       # Add here commands to compile the package.
-       cd $(CMAKE_TMP_DIR) && $(MAKE) all
-
-       for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
-               cat $$f > $${f%.in}; \
-               sed -i -e "s#@PREFIX@#$(PREFIX)#g" $${f%.in}; \
-               sed -i -e "s#@DATADIR@#$(DATADIR)#g" $${f%.in}; \
-       done
-
-       touch $@
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f *-stamp
-
-       rm -rf $(CMAKE_TMP_DIR)
-
-       for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
-               rm -f $${f%.in}; \
-       done
-
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-
-       # Add here commands to install the package into debian/ncurses.
-       cd $(CMAKE_TMP_DIR) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
-#      dh_installdocs
-       dh_installexamples
-       dh_install --list-missing --sourcedir=debian/tmp
-#      dh_installmenu
-#      dh_installdebconf
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_python
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
-       dh_installman
-       dh_link
-       dh_strip --dbg-package=app2sd-dbg
-       dh_compress
-       dh_fixperms
-#      dh_perl
-       dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

diff --git a/packaging/pkgmgr-info.changes b/packaging/pkgmgr-info.changes
index 5b03458..09e2f7c 100644 (file)
--- a/packaging/pkgmgr-info.changes
+++ b/packaging/pkgmgr-info.changes
@@ -1,3 +1,6 @@
+* Wed Jul 03 2013 Anas Nashif <anas.nashif@intel.com> accepted/tizen/20130520.100925@8038963
+- Clean up %post and install in /etc
+
 * Wed May 29 2013 Baptiste DURAND <baptiste.durand@eurogiciel.fr> accepted/tizen/20130520.100925@bdc01e7
 - Fix spec file according to RPMLINT Rules
 - Fix x64 arch compatibility

diff --git a/packaging/pkgmgr-info.spec b/packaging/pkgmgr-info.spec
index 08022d4..40962e6 100755 (executable)
--- a/packaging/pkgmgr-info.spec
+++ b/packaging/pkgmgr-info.spec
@@ -17,14 +17,12 @@ Packager Manager infomation api for packaging
 
 %package devel
 Summary:    Packager Manager infomation api (devel)
-Group:         Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 %description devel
 Packager Manager infomation api (devel)
 
 %package parser
 Summary:    Library for manifest parser
-Group:      Application Framework/Package Management
 Requires:   %{name} = %{version}-%{release}
 
 %description parser
@@ -32,7 +30,6 @@ Library for manifest parser
 
 %package parser-devel
 Summary:    Dev package for libpkgmgr-parser
-Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description parser-devel
@@ -48,29 +45,23 @@ make %{?jobs:-j%jobs}
 
 %install
 %make_install
+mkdir -p %{buildroot}/opt/usr/apps/tmp
+touch %{buildroot}/opt/usr/apps/tmp/pkgmgr_tmp.txt
 
-%post
-/sbin/ldconfig
-
-mkdir -p /opt/usr/apps/tmp
-chown 5100:5100 /opt/usr/apps/tmp
-chmod 771 /opt/usr/apps/tmp
-chsmack -a '*' /opt/usr/apps/tmp
-chsmack -t /opt/usr/apps/tmp
-
-touch /opt/usr/apps/tmp/pkgmgr_tmp.txt
-
-chsmack -a 'pkgmgr::db' /opt/usr/apps/tmp/pkgmgr_tmp.txt
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %post -n pkgmgr-info-parser -p /sbin/ldconfig
 
 %postun  -n pkgmgr-info-parser -p /sbin/ldconfig
+
 %files
 %manifest pkgmgr-info.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libpkgmgr-info.so.*
+%dir %attr(771,app,app) /opt/usr/apps/tmp
+/opt/usr/apps/tmp/pkgmgr_tmp.txt
 
 %files devel
 %defattr(-,root,root,-)
@@ -82,10 +73,10 @@ chsmack -a 'pkgmgr::db' /opt/usr/apps/tmp/pkgmgr_tmp.txt
 %manifest pkgmgr-parser.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libpkgmgr_parser.so.*
-%{_prefix}/etc/package-manager/preload/preload_list.txt
-%{_prefix}/etc/package-manager/preload/manifest.xsd
-%{_prefix}/etc/package-manager/preload/xml.xsd
-%{_prefix}/etc/package-manager/parser_path.conf
+%{_sysconfdir}/package-manager/preload/preload_list.txt
+%{_sysconfdir}/package-manager/preload/manifest.xsd
+%{_sysconfdir}/package-manager/preload/xml.xsd
+%{_sysconfdir}/package-manager/parser_path.conf
 
 %files parser-devel
 %defattr(-,root,root,-)

diff --git a/parser/CMakeLists.txt b/parser/CMakeLists.txt
index dbfa642..c7cdd08 100755 (executable)
--- a/parser/CMakeLists.txt
+++ b/parser/CMakeLists.txt
@@ -6,6 +6,7 @@ cmake_minimum_required(VERSION 2.6)
 #set(CMAKE_SKIP_BUILD_RPATH true)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
+INCLUDE(TizenCommon)
 
 ### Versioning
 if(DEFINED ${VERSION})
@@ -72,6 +73,6 @@ INSTALL(FILES
                ${CMAKE_CURRENT_BINARY_DIR}/pkgmgr-parser.pc
                DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/preload_list.txt DESTINATION ${PREFIX}/etc/package-manager/preload/)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.xsd DESTINATION ${PREFIX}/etc/package-manager/preload/)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/xml.xsd DESTINATION ${PREFIX}/etc/package-manager/preload/)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/preload_list.txt DESTINATION ${SYSCONFDIR}/package-manager/preload/)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.xsd DESTINATION ${SYSCONFDIR}/package-manager/preload/)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/xml.xsd DESTINATION ${SYSCONFDIR}/package-manager/preload/)

diff --git a/parser/pkgmgr_parser.c b/parser/pkgmgr_parser.c
index 5c23acc..2843148 100755 (executable)
--- a/parser/pkgmgr_parser.c
+++ b/parser/pkgmgr_parser.c
@@ -3729,7 +3729,7 @@ END:
 }
 
 #define MANIFEST_RO_PREFIX "/usr/share/packages/"
-#define PRELOAD_PACKAGE_LIST "/usr/etc/package-manager/preload/preload_list.txt"
+#define PRELOAD_PACKAGE_LIST "/etc/package-manager/preload/preload_list.txt"
 static int __add_preload_info(manifest_x * mfx, const char *manifest)
 {
        FILE *fp = NULL;

diff --git a/parser_path.conf.in b/parser_path.conf.in
old mode 100755 (executable)
new mode 100644 (file)
index f18cb8a..f2eeb2a
--- a/parser_path.conf.in
+++ b/parser_path.conf.in
@@ -1,4 +1,4 @@
 # usage
 # parserlib:directory_path
 
-parserlib:/usr/etc/package-manager/parserlib/
+parserlib:@SYSCONFDIR@/package-manager/parserlib/