Revert "Removed minor warning messages" 56/95056/1
authorYounho Park <younho.park@samsung.com>
Wed, 2 Nov 2016 07:34:25 +0000 (00:34 -0700)
committerYounho Park <younho.park@samsung.com>
Wed, 2 Nov 2016 07:34:25 +0000 (00:34 -0700)
This reverts commit 7a0969dffdd81662e75b39e33d3aadefe31393f9.

Change-Id: Ifff75af0c9d6476ac96408983821dde9f9faed0c

CMakeLists.txt
packaging/adid.spec [new file with mode: 0644]
packaging/org.tizen.settings-adid.spec [deleted file]
resources/edc/CMakeLists.txt
src/CMakeLists.txt

index 317345d9c080d585a4b93096a199fc23bf10fbef..e483e6582df1ca0eb9958c333c768a090f874e87 100644 (file)
@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(settings-adid C)
+PROJECT(adid C)
 SET(PROJECT_NAME org.tizen.settings-adid)
 
 # Version control
diff --git a/packaging/adid.spec b/packaging/adid.spec
new file mode 100644 (file)
index 0000000..f29adc0
--- /dev/null
@@ -0,0 +1,83 @@
+Name:       org.tizen.settings-adid
+Summary:    Ad Id
+Version:    0.0.1
+Release:    1
+Group:      comm
+License:    Apache-2.0
+Source0:    %{name}-%{version}.tar.gz
+BuildRequires: pkgconfig(capi-appfw-application)
+BuildRequires: pkgconfig(efl-extension)
+BuildRequires: pkgconfig(cairo)
+BuildRequires: pkgconfig(elementary)
+BuildRequires: pkgconfig(eina)
+BuildRequires: pkgconfig(evas)
+BuildRequires: pkgconfig(edje)
+BuildRequires: pkgconfig(dlog)
+BuildRequires: pkgconfig(vconf)
+BuildRequires: pkgconfig(appcore-efl)
+BuildRequires: pkgconfig(capi-system-system-settings)
+BuildRequires: edje-bin
+BuildRequires: cmake
+BuildRequires: gettext-tools
+Requires(post):   /sbin/ldconfig
+Requires(post):   /usr/bin/vconftool
+requires(postun): /sbin/ldconfig
+
+%define appdir /usr/apps/org.tizen.settings-adid
+
+%description
+Tizen Ad-Id Setting Application
+
+%prep
+%setup -q
+
+%build
+export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
+export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
+export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
+
+%define PREFIX    "/usr/apps/org.tizen.settings-adid"
+%define RW_PREFIX      "/opt/usr/apps/org.tizen.settings-adid"
+
+cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DCMAKE_INSTALL_RW_PREFIX=%{RW_PREFIX}
+cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DCMAKE_INSTALL_DATADIR=%{DATADIR}
+cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DCMAKE_INSTALL_SHAREDDIR=%{SHAREDDIR}
+make %{?jobs:-j%jobs}
+
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/usr/share/license
+cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
+
+%make_install
+
+###### for package signing step ######
+%define tizen_sign 1
+%define tizen_sign_base /usr/apps/org.tizen.settings-adid
+%define tizen_sign_level platform
+%define tizen_author_sign 1
+%define tizen_dist_sign 1
+
+%post
+/sbin/ldconfig
+mkdir -p /opt/usr/apps/org.tizen.settings-adid/data
+chown -R 5000:5000 /opt/usr/apps/org.tizen.settings-adid/data
+echo -e '\033[1m\033[36m ===== Import to package DB using tpk-backend ===== \033[0m'
+echo 'tpk-backend -y %{name} --preload'
+tpk-backend -y %{name} --preload
+echo -e '\033[1m\033[36m ===== done ===== \033[0m'
+
+%postun -p /sbin/ldconfig
+
+%files
+%manifest org.tizen.settings-adid.manifest
+%defattr(-,root,root,-)
+/usr/share/license/%{name}
+%attr(-,inhouse,inhouse)
+/usr/apps/org.tizen.settings-adid/*
+%defattr(-,root,root,-)
+%{appdir}/data/
+/usr/share/packages/org.tizen.settings-adid.xml
+%defattr(-,*,*,-)
+%dir
diff --git a/packaging/org.tizen.settings-adid.spec b/packaging/org.tizen.settings-adid.spec
deleted file mode 100644 (file)
index 8bbfa7b..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-Name:       org.tizen.settings-adid
-Summary:    Ad Id
-Version:    0.0.1
-Release:    1
-Group:      Network & Connectivity/Service
-License:    Apache-2.0
-Source0:    %{name}-%{version}.tar.gz
-BuildRequires: pkgconfig(capi-appfw-application)
-BuildRequires: pkgconfig(efl-extension)
-BuildRequires: pkgconfig(cairo)
-BuildRequires: pkgconfig(elementary)
-BuildRequires: pkgconfig(eina)
-BuildRequires: pkgconfig(evas)
-BuildRequires: pkgconfig(edje)
-BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(vconf)
-BuildRequires: pkgconfig(appcore-efl)
-BuildRequires: pkgconfig(capi-system-system-settings)
-BuildRequires: pkgconfig(libtzplatform-config)
-BuildRequires: edje-bin
-BuildRequires: cmake
-BuildRequires: gettext-tools
-Requires(post):   /sbin/ldconfig
-Requires(post):   /usr/bin/vconftool
-requires(postun): /sbin/ldconfig
-
-%define appdir /%{TZ_SYS_RO_APP}/%{name}
-
-%description
-Tizen Ad-Id Setting Application
-
-%prep
-%setup -q
-
-%build
-export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
-export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
-
-%define PREFIX    "/usr/apps/org.tizen.settings-adid"
-%define RW_PREFIX      "/opt/usr/apps/org.tizen.settings-adid"
-
-cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DCMAKE_INSTALL_RW_PREFIX=%{RW_PREFIX}
-cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DCMAKE_INSTALL_DATADIR=%{DATADIR}
-cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DCMAKE_INSTALL_SHAREDDIR=%{SHAREDDIR}
-make %{?jobs:-j%jobs}
-
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/license
-cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
-
-%make_install
-
-###### for package signing step ######
-%define tizen_sign 1
-%define tizen_sign_base %{TZ_SYS_RO_APP}/%{name}
-%define tizen_sign_level platform
-%define tizen_author_sign 1
-%define tizen_dist_sign 1
-
-%post
-/sbin/ldconfig
-mkdir -p /opt/usr/apps/%{name}/data
-chown -R 5000:5000 /opt/usr/apps/%{name}/data
-echo -e '\033[1m\033[36m ===== Import to package DB using tpk-backend ===== \033[0m'
-echo 'tpk-backend -y %{name} --preload'
-tpk-backend -y %{name} --preload
-echo -e '\033[1m\033[36m ===== done ===== \033[0m'
-
-%postun -p /sbin/ldconfig
-
-%files
-%manifest %{name}.manifest
-%defattr(-,root,root,-)
-/usr/share/license/%{name}
-%attr(-,inhouse,inhouse)
-%{TZ_SYS_RO_APP}/%{name}/*
-%defattr(-,root,root,-)
-%{appdir}/data/
-%{TZ_SYS_RO_PACKAGES}/%{name}.xml
-%defattr(-,*,*,-)
-%dir
index 2ca2a8dbae7f1d494c2ef6b5c4e4c9eaa7ff8ff6..cbdcd9c87fdc50163193ba3e915522c4024952fa 100644 (file)
@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(settings-adid C CXX)
+PROJECT(adid C CXX)
 
 ADD_CUSTOM_TARGET(adid.edj
        COMMAND edje_cc -no-save -id ${CMAKE_CURRENT_SOURCE_DIR}/../data/images
index 9617a8d0c6e5585cbeebacb0229d9692ff3ce810..58151b43b766f865793235fb2eb8a440e96c9d59 100644 (file)
@@ -1,6 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
-PROJECT(settings-adid C)
+PROJECT(adid C)
 
 IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
        SET(CMAKE_BUILD_TYPE "Release")