revise packaging

Change-Id: I10b0e8fc5b44d1e69d97f3cc5b0a34bc290b0444

diff --git a/packaging/phonenumber-utils.manifest b/packaging/phonenumber-utils.manifest
index 3ddeed265fb867d610a57672b699cb4171aab6b2..97e8c3134908aa65aaf95cec6195b148dff5b49f 100644 (file)
--- a/packaging/phonenumber-utils.manifest
+++ b/packaging/phonenumber-utils.manifest
@@ -1,16 +1,5 @@
 <manifest>
-       <define>
-               <domain name="phonenumber-utils" />
-               <provide>
-                       <label name="phonenumber-utils::db" />
-               </provide>
-       </define>
-       <assign>
-               <filesystem path="/usr/lib/libphonenumber-utils.so*" label="_" exec_label="_" />
-               <filesystem path="/opt/usr/data/phonenumber-utils" label="phonenumber-utils::db" type="transmutable" />
-               <filesystem path="/opt/usr/data/phonenumber-utils/downloads" label="phonenumber-utils::db" type="transmutable" />
-       </assign>
        <request>
-               <domain name="phonenumber-utils" />
+               <domain name="_"/>
        </request>
 </manifest>

diff --git a/packaging/phonenumber-utils.spec b/packaging/phonenumber-utils.spec
index 9c8a5c034eb6144d39f626819eef7f3704fd6724..56aae9fc14b66ac7261a97ae003aeb7998bbc9e5 100644 (file)
--- a/packaging/phonenumber-utils.spec
+++ b/packaging/phonenumber-utils.spec
@@ -16,14 +16,14 @@ BuildRequires: pkgconfig(capi-base-common)
 BuildRequires: libphonenumber-devel
 
 %description
-Phone Number Utilities
+Phone Number Utilities(location, formatted number)
 
 %package devel
 Summary:    Phone Number Utilities (devel)
 Group:      Telephony/Development
 Requires:   %{name} = %{version}-%{release}
 
-%description -n phonenumber-utils-devel
+%description devel
 Phone Number Utilities development kit
 
 %prep
@@ -31,10 +31,6 @@ Phone Number Utilities development kit
 cp %{SOURCE1001} .
 
 %build
-export CFLAGS="$CFLAGS -DTIZEN_ENGINEER_MODE"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_ENGINEER_MODE"
-export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE"
-
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %cmake . -DMAJORVER=${MAJORVER} -DFULLVER=%{version}
 
@@ -42,11 +38,7 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 rm -rf %{buildroot}
 %make_install
 
-mkdir -p %{buildroot}/usr/share/license
-cp LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
-cp LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}-devel
-
-%post -n %{name}
+%post
 /sbin/ldconfig
 
 chown :5000 -R /opt/usr/data/%{name}
@@ -59,12 +51,11 @@ chmod 775 -R /opt/usr/data/%{name}
 %defattr(-,root,root,-)
 %{_libdir}/lib%{name}.so.*
 /opt/usr/data/%{name}
-/opt/usr/data/%{name}/downloads
-/usr/share/license/%{name}
+%license LICENSE.APLv2
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/lib%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/%{name}/*.h
-/usr/share/license/%{name}-devel
+%license LICENSE.APLv2

diff --git a/src/phn_location.c b/src/phn_location.c
index 2f745a282cbcd34e04b5956ce2061eb109942e97..0e8f6b1ec62cad0f9bdfa0e012174eebe7384dde 100644 (file)
--- a/src/phn_location.c
+++ b/src/phn_location.c
@@ -102,7 +102,6 @@ int phn_location_get_location_from_extra_data(const char *file, const char *numb
        int ret = 0;
        int city_str_len = 0;
        int province_str_len = 0;
-       size_t read_size;
        gchar *city_temp = NULL;
        gchar *province_temp = NULL;
        const char *real_number = number;