Corrected spec file names

Change-Id: Id49ab7bdb7ee296dd8ec16454c191bebafd986da
Signed-off-by: Imran Zaman <imran.zaman@intel.com>

diff --git a/dists/rpm/gum-suse.spec b/dists/rpm/gum-suse.spec
index ad91d60..690065e 100644 (file)
--- a/dists/rpm/gum-suse.spec
+++ b/dists/rpm/gum-suse.spec
@@ -5,13 +5,13 @@
 %define debug_build 0
 
 
-Name: gum
+Name: gumd
 Summary: User management daemon and client library
 Version: 0.0.1
 Release: 1
 Group: System/Libraries
 License: LGPL-2.1+
-Source: %{name}d-%{version}.tar.gz
+Source: %{name}-%{version}.tar.gz
 URL: https://github.com/01org/gumd
 %if %{dbus_type} != "p2p"
 Requires: dbus-1
@@ -32,70 +32,70 @@ BuildRequires: pkgconfig(gmodule-2.0)
 %{summary}.
 
 
-%package -n lib%{name}-common
+%package -n libgum-common
 Summary:    User management common library
 Group:      System/Libraries
 
 
-%description -n lib%{name}-common
+%description -n libgum-common
 %{summary}.
 
 
-%package -n lib%{name}-common-devel
+%package -n libgum-common-devel
 Summary:    Development files for user management common library
 Group:      Development/Libraries
-Requires:   lib%{name}-common = %{version}-%{release}
+Requires:   libgum-common = %{version}-%{release}
 
 
-%description -n lib%{name}-common-devel
+%description -n libgum-common-devel
 %{summary}.
 
 
-%package -n %{name}d
+%package %{name}
 Summary:    User management daemon
 Group:      System/Daemons
-Requires:   lib%{name}-common = %{version}-%{release}
+Requires:   libgum-common = %{version}-%{release}
 
 
-%description -n %{name}d
+%description %{name}
 %{summary}.
 
 
-%package -n %{name}d-devel
+%package -n %{name}-devel
 Summary:    Development files for user management daemon
 Group:      Development/Daemons
-Requires:   %{name}d = %{version}-%{release}
-Requires:   lib%{name}-common-devel = %{version}-%{release}
+Requires:   %{name} = %{version}-%{release}
+Requires:   libgum-common-devel = %{version}-%{release}
 
-%description -n %{name}d-devel
+%description -n %{name}-devel
 %{summary}.
 
 
-%package -n lib%{name}
+%package -n libgum
 Summary:    User management client library
 Group:      System/Libraries
-Requires:   lib%{name}-common = %{version}-%{release}
+Requires:   libgum-common = %{version}-%{release}
 
 
-%description -n lib%{name}
+%description -n libgum
 %{summary}.
 
 
-%package -n lib%{name}-devel
+%package -n libgum-devel
 Summary:    Development files for user management client library
 Group:      Development/Libraries
-Requires:   lib%{name} = %{version}-%{release}
-Requires:   lib%{name}-common-devel = %{version}-%{release}
+Requires:   libgum = %{version}-%{release}
+Requires:   libgum-common-devel = %{version}-%{release}
 
 
-%description -n lib%{name}-devel
+%description -n libgum-devel
 %{summary}.
 
 
 %package doc
 Summary:    Documentation files for %{name}
 Group:      Development/Libraries
-Requires:   lib%{name} = %{version}-%{release}
+Requires:   libgum = %{version}-%{release}
 
 
 %description doc
@@ -124,34 +124,34 @@ rm -rf %{buildroot}
 
 %post
 /sbin/ldconfig
-chmod u+s %{_bindir}/%{name}d
+chmod u+s %{_bindir}/%{name}
 groupadd -f -r gumd
 
 
 %postun -p /sbin/ldconfig
 
 
-%files -n lib%{name}-common
+%files -n libgum-common
 %defattr(-,root,root,-)
-%{_libdir}/lib%{name}-common*.so.*
+%{_libdir}/libgum-common*.so.*
 
 
-%files -n lib%{name}-common-devel
+%files -n libgum-common-devel
 %defattr(-,root,root,-)
-%{_includedir}/%{name}/common/*
-%{_libdir}/lib%{name}-common*.so
-%{_libdir}/lib%{name}-common*.la
-%{_libdir}/pkgconfig/lib%{name}-common.pc
+%{_includedir}/gum/common/*
+%{_libdir}/libgum-common*.so
+%{_libdir}/libgum-common*.la
+%{_libdir}/pkgconfig/libgum-common.pc
 %config(noreplace) %{_sysconfdir}/gum.conf
 %if %{dbus_type} != "p2p"
 %{_datadir}/dbus-1/interfaces/*UserManagement*.xml
 %endif
 
 
-%files -n %{name}d
+%files %{name}
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING.LIB INSTALL NEWS README
-%{_bindir}/%{name}d
+%{_bindir}/%{name}
 %if %{dbus_type} == "session"
 %dir %{_datadir}/dbus-1/services
 %{_datadir}/dbus-1/services/*UserManagement*.service
@@ -164,23 +164,23 @@ groupadd -f -r gumd
 %endif
 
 
-%files -n %{name}d-devel
+%files -n %{name}-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/%{name}d.pc
+%{_libdir}/pkgconfig/%{name}.pc
 
 
-%files -n lib%{name}
+%files -n libgum
 %defattr(-,root,root,-)
-%{_libdir}/lib%{name}.so.*
+%{_libdir}/libgum.so.*
 
 
-%files -n lib%{name}-devel
+%files -n libgum-devel
 %defattr(-,root,root,-)
-%{_includedir}/%{name}/*.h
-%{_libdir}/lib%{name}.so
-%{_libdir}/lib%{name}.la
-%{_libdir}/pkgconfig/lib%{name}.pc
-%{_bindir}/%{name}-example
+%{_includedir}/gum/*.h
+%{_libdir}/libgum.so
+%{_libdir}/libgum.la
+%{_libdir}/pkgconfig/libgum.pc
+%{_bindir}/gum-example
 
 
 %files doc
@@ -190,6 +190,9 @@ groupadd -f -r gumd
 
 %changelog
 * Fri Dec 20 2013 Imran Zaman <imran.zaman@intel.com>
+- Corrected spec and changes file names 
+
+* Fri Dec 20 2013 Imran Zaman <imran.zaman@intel.com>
 - Removed dist spec packaging folder from main source tree
 
 * Fri Dec 20 2013 Imran Zaman <imran.zaman@intel.com>

diff --git a/dists/rpm/tizen/packaging/gum-tizen.changes b/dists/rpm/tizen/packaging/gumd.changes
similarity index 74%
rename from dists/rpm/tizen/packaging/gum-tizen.changes
rename to dists/rpm/tizen/packaging/gumd.changes
index d017adf..c9b00ac 100644 (file)
--- a/dists/rpm/tizen/packaging/gum-tizen.changes
+++ b/dists/rpm/tizen/packaging/gumd.changes
@@ -1,4 +1,7 @@
 * Fri Dec 20 2013 Imran Zaman <imran.zaman@intel.com>
+- Corrected spec and changes file names 
+
+* Fri Dec 20 2013 Imran Zaman <imran.zaman@intel.com>
 - Removed dist spec packaging folder from main source tree
 
 * Fri Dec 20 2013 Imran Zaman <imran.zaman@intel.com>

diff --git a/dists/rpm/tizen/packaging/gum-tizen.spec b/dists/rpm/tizen/packaging/gumd.spec
similarity index 60%
rename from dists/rpm/tizen/packaging/gum-tizen.spec
rename to dists/rpm/tizen/packaging/gumd.spec
index 8bc07d2..ed7e5b3 100644 (file)
--- a/dists/rpm/tizen/packaging/gum-tizen.spec
+++ b/dists/rpm/tizen/packaging/gumd.spec
@@ -4,17 +4,17 @@
 # WARNING! do not use for production builds as it will break security
 %define debug_build 0
 
-Name: gum
+Name: gumd
 Summary: User management daemon and client library
 Version: 0.0.1
 Release: 1
 Group: System/Libraries
 License: LGPL-2.1+
-Source: %{name}d-%{version}.tar.gz
+Source: %{name}-%{version}.tar.gz
 URL: https://github.com/01org/gumd
-Source1001:     %{name}d.manifest
-Source1002:     lib%{name}.manifest
-Source1003:     lib%{name}-common.manifest
+Source1001:     %{name}.manifest
+Source1002:     libgum.manifest
+Source1003:     libgum-common.manifest
 %if %{dbus_type} != "p2p"
 Requires: dbus-1
 %endif
@@ -34,71 +34,71 @@ BuildRequires: pkgconfig(gmodule-2.0)
 %{summary}.
 
 
-%package -n lib%{name}-common
+%package -n libgum-common
 Summary:    User management common library
 Group:      System/Libraries
 
 
-%description -n lib%{name}-common
+%description -n libgum-common
 %{summary}.
 
 
-%package -n lib%{name}-common-devel
+%package -n libgum-common-devel
 Summary:    Development files for user management common library
 Group:      Development/Libraries
-Requires:   lib%{name}-common = %{version}-%{release}
+Requires:   libgum-common = %{version}-%{release}
 
 
-%description -n lib%{name}-common-devel
+%description -n libgum-common-devel
 %{summary}.
 
 
-%package -n %{name}d
+%package %{name}
 Summary:    User management daemon
 Group:      System/Daemons
-Requires:   lib%{name}-common = %{version}-%{release}
+Requires:   libgum-common = %{version}-%{release}
 
 
-%description -n %{name}d
+%description %{name}
 %{summary}.
 
 
-%package -n %{name}d-devel
+%package -n %{name}-devel
 Summary:    Development files for user management daemon
 Group:      Development/Daemons
-Requires:   %{name}d = %{version}-%{release}
-Requires:   lib%{name}-common-devel = %{version}-%{release}
+Requires:   %{name} = %{version}-%{release}
+Requires:   libgum-common-devel = %{version}-%{release}
 
 
-%description -n %{name}d-devel
+%description -n %{name}-devel
 %{summary}.
 
 
-%package -n lib%{name}
+%package -n libgum
 Summary:    User management client library
 Group:      System/Libraries
-Requires:   lib%{name}-common = %{version}-%{release}
+Requires:   libgum-common = %{version}-%{release}
 
 
-%description -n lib%{name}
+%description -n libgum
 %{summary}.
 
 
-%package -n lib%{name}-devel
+%package -n libgum-devel
 Summary:    Development files for user management client library
 Group:      Development/Libraries
-Requires:   lib%{name} = %{version}-%{release}
-Requires:   lib%{name}-common-devel = %{version}-%{release}
+Requires:   libgum = %{version}-%{release}
+Requires:   libgum-common-devel = %{version}-%{release}
 
 
-%description -n lib%{name}-devel
+%description -n libgum-devel
 %{summary}.
 
 
 %package doc
 Summary:    Documentation files for %{name}
 Group:      Development/Libraries
-Requires:   lib%{name} = %{version}-%{release}
+Requires:   libgum = %{version}-%{release}
 
 
 %description doc
@@ -122,41 +122,41 @@ make %{?_smp_mflags}
 %install
 rm -rf %{buildroot}
 %make_install
-cp -a %{SOURCE1001} %{buildroot}%{_datadir}/%{name}d.manifest
-cp -a %{SOURCE1002} %{buildroot}%{_datadir}/lib%{name}.manifest
-cp -a %{SOURCE1003} %{buildroot}%{_datadir}/lib%{name}-common.manifest
+cp -a %{SOURCE1001} %{buildroot}%{_datadir}/%{name}.manifest
+cp -a %{SOURCE1002} %{buildroot}%{_datadir}/libgum.manifest
+cp -a %{SOURCE1003} %{buildroot}%{_datadir}/libgum-common.manifest
 
 %post
 /sbin/ldconfig
-chmod u+s %{_bindir}/%{name}d
+chmod u+s %{_bindir}/%{name}
 getent group gumd > /dev/null || /usr/sbin/groupadd -r gumd
 
 
 %postun -p /sbin/ldconfig
 
 
-%files -n lib%{name}-common
+%files -n libgum-common
 %defattr(-,root,root,-)
-%manifest %{_datadir}/lib%{name}-common.manifest
-%{_libdir}/lib%{name}-common*.so.*
+%manifest %{_datadir}/libgum-common.manifest
+%{_libdir}/libgum-common*.so.*
 
 
-%files -n lib%{name}-common-devel
+%files -n libgum-common-devel
 %defattr(-,root,root,-)
-%{_includedir}/%{name}/common/*
-%{_libdir}/lib%{name}-common*.so
-%{_libdir}/pkgconfig/lib%{name}-common.pc
+%{_includedir}/gum/common/*
+%{_libdir}/libgum-common*.so
+%{_libdir}/pkgconfig/libgum-common.pc
 %config(noreplace) %{_sysconfdir}/gum.conf
 %if %{dbus_type} != "p2p"
 %{_datadir}/dbus-1/interfaces/*UserManagement*.xml
 %endif
 
 
-%files -n %{name}d
+%files %{name}
 %defattr(-,root,root,-)
-%manifest %{_datadir}/%{name}d.manifest
+%manifest %{_datadir}/%{name}.manifest
 %doc AUTHORS COPYING.LIB INSTALL NEWS README
-%{_bindir}/%{name}d
+%{_bindir}/%{name}
 %if %{dbus_type} == "session"
 %dir %{_datadir}/dbus-1/services
 %{_datadir}/dbus-1/services/*UserManagement*.service
@@ -169,23 +169,23 @@ getent group gumd > /dev/null || /usr/sbin/groupadd -r gumd
 %endif
 
 
-%files -n %{name}d-devel
+%files -n %{name}-devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/%{name}d.pc
+%{_libdir}/pkgconfig/%{name}.pc
 
 
-%files -n lib%{name}
+%files -n libgum
 %defattr(-,root,root,-)
-%manifest %{_datadir}/lib%{name}.manifest
-%{_libdir}/lib%{name}.so.*
+%manifest %{_datadir}/libgum.manifest
+%{_libdir}/libgum.so.*
 
 
-%files -n lib%{name}-devel
+%files -n libgum-devel
 %defattr(-,root,root,-)
-%{_includedir}/%{name}/*.h
-%{_libdir}/lib%{name}.so
-%{_libdir}/pkgconfig/lib%{name}.pc
-%{_bindir}/%{name}-example
+%{_includedir}/gum/*.h
+%{_libdir}/libgum.so
+%{_libdir}/pkgconfig/libgum.pc
+%{_bindir}/gum-example
 
 
 %files doc

diff --git a/docs/html/GumConfig.html b/docs/html/GumConfig.html
index 0456181..c65e396 100644 (file)
--- a/docs/html/GumConfig.html
+++ b/docs/html/GumConfig.html
@@ -87,7 +87,7 @@ for where the file is searched for.
 <p>
 </p>
 <div class="refsect1">
-<a name="idp7314208"></a><h2>Usage</h2>
+<a name="idp9382416"></a><h2>Usage</h2>
 </div>
 <p>
 Following code snippet demonstrates how to create and use config object:
@@ -105,7 +105,7 @@ g_object_unref(config);
 <p>
 </p>
 <div class="refsect1">
-<a name="idp8963632"></a><h2>Where the configuration file is searched for</h2>
+<a name="idp7284144"></a><h2>Where the configuration file is searched for</h2>
 </div>
 <p>
 </p>
@@ -127,7 +127,7 @@ $(sysconfdir) + "gum.conf"
 <p>
 </p>
 <div class="refsect1">
-<a name="idp10051440"></a><h2>Example configuration file</h2>
+<a name="idp6782576"></a><h2>Example configuration file</h2>
 </div>
 <p>
 </p>

diff --git a/docs/html/GumDisposable.html b/docs/html/GumDisposable.html
index 9d7142c..d7136b5 100644 (file)
--- a/docs/html/GumDisposable.html
+++ b/docs/html/GumDisposable.html
@@ -90,7 +90,7 @@ be required to destory after some period of inactivity.
 <p>
 </p>
 <div class="refsect1">
-<a name="idp6595328"></a><h2>Usage</h2>
+<a name="idp10384912"></a><h2>Usage</h2>
 </div>
 <p>
 Following code snippet demonstrates how to derive and use <a class="link" href="GumDisposable.html" title="GumDisposable"><span class="type">GumDisposable</span></a>:

diff --git a/docs/html/ch01.html b/docs/html/ch01.html
index e61c9b9..b36ea46 100644 (file)
--- a/docs/html/ch01.html
+++ b/docs/html/ch01.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp2490512"></a>Daemon (gumd) configuration</h2></div></div></div>
+<a name="idp194256"></a>Daemon (gumd) configuration</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="GumConfig.html">GumConfig</a></span><span class="refpurpose"> — gum configuration information</span>

diff --git a/docs/html/ch02.html b/docs/html/ch02.html
index 34598c2..80ed324 100644 (file)
--- a/docs/html/ch02.html
+++ b/docs/html/ch02.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp1651168"></a>Common</h2></div></div></div>
+<a name="idp2395904"></a>Common</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="gumd-GumDictionary.html">GumDictionary</a></span><span class="refpurpose"> — a dictionary container holding string keys and variant

diff --git a/docs/html/ch03.html b/docs/html/ch03.html
index aa001d8..579e05f 100644 (file)
--- a/docs/html/ch03.html
+++ b/docs/html/ch03.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp3159088"></a>Client library (libgum) interface</h2></div></div></div>
+<a name="idp55488"></a>Client library (libgum) interface</h2></div></div></div>
 <div class="toc"><dl>
 <dt>
 <span class="refentrytitle"><a href="GumUser.html">GumUser</a></span><span class="refpurpose"> — provides interface for managing user's account</span>

diff --git a/docs/html/ch04.html b/docs/html/ch04.html
index d1bbbcd..843c1a9 100644 (file)
--- a/docs/html/ch04.html
+++ b/docs/html/ch04.html
@@ -54,7 +54,7 @@
 </table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp129744"></a>Appendices</h2></div></div></div>
+<a name="idp57888"></a>Appendices</h2></div></div></div>
 <a name="idx"></a><a name="idxC"></a><h3 class="title">C</h3>
 <dt>
 <a class="link" href="GumConfig.html#GumConfig-struct" title="struct GumConfig">GumConfig</a>, struct in <a class="link" href="GumConfig.html" title="GumConfig">GumConfig</a>

diff --git a/docs/html/ch05.html b/docs/html/ch05.html
index 4f07292..e58ca54 100644 (file)
--- a/docs/html/ch05.html
+++ b/docs/html/ch05.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="idp127952"></a>Deprecated APIs</h2></div></div></div>
+<a name="idp181696"></a>Deprecated APIs</h2></div></div></div>
 <a name="idx"></a>
 </div>
 <div class="footer">

diff --git a/docs/html/gumd-examples.html b/docs/html/gumd-examples.html
index 366ca01..710bff0 100644 (file)
--- a/docs/html/gumd-examples.html
+++ b/docs/html/gumd-examples.html
@@ -45,7 +45,7 @@
      </p>
 </div>
 <div class="refsect1">
-<a name="idp10256144"></a><h2>Add User</h2>
+<a name="idp8731824"></a><h2>Add User</h2>
 <p>
         User can be added with flag <strong class="userinput"><code>--add-user</code></strong>:
         </p>
@@ -74,7 +74,7 @@
      </p>
 </div>
 <div class="refsect1">
-<a name="idp10571952"></a><h2>Delete User</h2>
+<a name="idp6979616"></a><h2>Delete User</h2>
 <p>
         User can be deleted with flag <strong class="userinput"><code>--delete-user</code></strong>:
         </p>
@@ -89,7 +89,7 @@
      </p>
 </div>
 <div class="refsect1">
-<a name="idp12970208"></a><h2>Update User</h2>
+<a name="idp10955552"></a><h2>Update User</h2>
 <p>
         User can be update with flag <strong class="userinput"><code>--update-user</code></strong>:
         </p>
@@ -113,7 +113,7 @@
      </p>
 </div>
 <div class="refsect1">
-<a name="idp12975072"></a><h2>Get User</h2>
+<a name="idp14293392"></a><h2>Get User</h2>
 <p>
         User data can be retrieved with flag <strong class="userinput"><code>--get-user</code></strong>:
         </p>
@@ -128,7 +128,7 @@
      </p>
 </div>
 <div class="refsect1">
-<a name="idp12697184"></a><h2>Get User By Name</h2>
+<a name="idp13233104"></a><h2>Get User By Name</h2>
 <p>
         User data can be retrieved with flag <strong class="userinput"><code>--get-user-by-name</code></strong>:
         </p>
@@ -143,7 +143,7 @@
      </p>
 </div>
 <div class="refsect1">
-<a name="idp12701696"></a><h2>Add Group</h2>
+<a name="idp13370816"></a><h2>Add Group</h2>
 <p>
         Group can be added with flag <strong class="userinput"><code>--add-group</code></strong>:
         </p>
@@ -162,7 +162,7 @@
      </p>
 </div>
 <div class="refsect1">
-<a name="idp14400608"></a><h2>Delete Group</h2>
+<a name="idp13375584"></a><h2>Delete Group</h2>
 <p>
         Group can be deleted with flag <strong class="userinput"><code>--delete-group</code></strong>:
         </p>
@@ -177,7 +177,7 @@
      </p>
 </div>
 <div class="refsect1">
-<a name="idp14405120"></a><h2>Update Group</h2>
+<a name="idp14734608"></a><h2>Update Group</h2>
 <p>
         Group can be updated with flag <strong class="userinput"><code>--udpate-group</code></strong>:
         </p>
@@ -194,7 +194,7 @@
      </p>
 </div>
 <div class="refsect1">
-<a name="idp14409712"></a><h2>Get Group</h2>
+<a name="idp14739200"></a><h2>Get Group</h2>
 <p>
         Group data can be retrieved with flag <strong class="userinput"><code>--get-group</code></strong>:
         </p>
@@ -209,7 +209,7 @@
      </p>
 </div>
 <div class="refsect1">
-<a name="idp14323440"></a><h2>Get Group By Name</h2>
+<a name="idp14743712"></a><h2>Get Group By Name</h2>
 <p>
         Group data can be retrieved with flag <strong class="userinput"><code>--get-group-by-name</code></strong>:
         </p>
@@ -224,7 +224,7 @@
      </p>
 </div>
 <div class="refsect1">
-<a name="idp14327952"></a><h2>Add member To Group</h2>
+<a name="idp14748224"></a><h2>Add member To Group</h2>
 <p>
         New member can be added to a group with flag <strong class="userinput"><code>--add-member</code></strong>:
         </p>
@@ -240,7 +240,7 @@
      </p>
 </div>
 <div class="refsect1">
-<a name="idp14332512"></a><h2>Delete member From Group</h2>
+<a name="idp14301424"></a><h2>Delete member From Group</h2>
 <p>
         A member can be removed from the group with flag <strong class="userinput"><code>--delete-member</code></strong>:
         </p>

diff --git a/docs/html/um-intro.html b/docs/html/um-intro.html
index 1e727a2..6f7d939 100644 (file)
--- a/docs/html/um-intro.html
+++ b/docs/html/um-intro.html
@@ -22,7 +22,7 @@
 <div class="refentry">
 <a name="um-intro"></a><div class="titlepage"></div>
 <div class="refsect1">
-<a name="idp8528048"></a><h2>What is gumd/libgum?</h2>
+<a name="idp9297008"></a><h2>What is gumd/libgum?</h2>
 <p>
         gumd and libgum together provides a framework for creating, deleting
         and modifying user and groups in the system. gumd is a daemon that

diff --git a/packaging b/packaging
new file mode 120000 (symlink)
index 0000000..ed43530
--- /dev/null
+++ b/packaging
@@ -0,0 +1 @@
+dists/rpm/tizen/packaging
\ No newline at end of file

diff --git a/packaging/gum-tizen.changes b/packaging/gum-tizen.changes
deleted file mode 100644 (file)
index d017adf..0000000
--- a/packaging/gum-tizen.changes
+++ /dev/null
@@ -1,8 +0,0 @@
-* Fri Dec 20 2013 Imran Zaman <imran.zaman@intel.com>
-- Removed dist spec packaging folder from main source tree
-
-* Fri Dec 20 2013 Imran Zaman <imran.zaman@intel.com>
-- Release 0.0.1  (First release)
-
-* Mon Sep 02 2013 Imran Zaman <imran.zaman@intel.com>
-- Initial RPM packaging

diff --git a/packaging/gum-tizen.spec b/packaging/gum-tizen.spec
deleted file mode 100644 (file)
index 8bc07d2..0000000
--- a/packaging/gum-tizen.spec
+++ /dev/null
@@ -1,193 +0,0 @@
-# define used dbus type [p2p, session, system]
-%define dbus_type system
-# enable debug features such as control environment variables
-# WARNING! do not use for production builds as it will break security
-%define debug_build 0
-
-Name: gum
-Summary: User management daemon and client library
-Version: 0.0.1
-Release: 1
-Group: System/Libraries
-License: LGPL-2.1+
-Source: %{name}d-%{version}.tar.gz
-URL: https://github.com/01org/gumd
-Source1001:     %{name}d.manifest
-Source1002:     lib%{name}.manifest
-Source1003:     lib%{name}-common.manifest
-%if %{dbus_type} != "p2p"
-Requires: dbus-1
-%endif
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-BuildRequires: pkgconfig(systemd)
-BuildRequires: pkgconfig(dbus-1)
-BuildRequires: pkgconfig(gtk-doc)
-BuildRequires: pkgconfig(glib-2.0) >= 2.30
-BuildRequires: pkgconfig(gobject-2.0)
-BuildRequires: pkgconfig(gio-2.0)
-BuildRequires: pkgconfig(gio-unix-2.0)
-BuildRequires: pkgconfig(gmodule-2.0)
-
-
-%description
-%{summary}.
-
-
-%package -n lib%{name}-common
-Summary:    User management common library
-Group:      System/Libraries
-
-
-%description -n lib%{name}-common
-%{summary}.
-
-
-%package -n lib%{name}-common-devel
-Summary:    Development files for user management common library
-Group:      Development/Libraries
-Requires:   lib%{name}-common = %{version}-%{release}
-
-
-%description -n lib%{name}-common-devel
-%{summary}.
-
-
-%package -n %{name}d
-Summary:    User management daemon
-Group:      System/Daemons
-Requires:   lib%{name}-common = %{version}-%{release}
-
-
-%description -n %{name}d
-%{summary}.
-
-
-%package -n %{name}d-devel
-Summary:    Development files for user management daemon
-Group:      Development/Daemons
-Requires:   %{name}d = %{version}-%{release}
-Requires:   lib%{name}-common-devel = %{version}-%{release}
-
-
-%description -n %{name}d-devel
-%{summary}.
-
-
-%package -n lib%{name}
-Summary:    User management client library
-Group:      System/Libraries
-Requires:   lib%{name}-common = %{version}-%{release}
-
-
-%description -n lib%{name}
-%{summary}.
-
-
-%package -n lib%{name}-devel
-Summary:    Development files for user management client library
-Group:      Development/Libraries
-Requires:   lib%{name} = %{version}-%{release}
-Requires:   lib%{name}-common-devel = %{version}-%{release}
-
-
-%description -n lib%{name}-devel
-%{summary}.
-
-
-%package doc
-Summary:    Documentation files for %{name}
-Group:      Development/Libraries
-Requires:   lib%{name} = %{version}-%{release}
-
-
-%description doc
-%{summary}.
-
-
-%prep
-%setup -q -n %{name}-%{version}
-
-
-%build
-%if %{debug_build} == 1
-%configure --enable-dbus-type=%{dbus_type} %{_enable_debug}
-%else
-%configure --enable-dbus-type=%{dbus_type}
-%endif
-
-make %{?_smp_mflags}
-
-
-%install
-rm -rf %{buildroot}
-%make_install
-cp -a %{SOURCE1001} %{buildroot}%{_datadir}/%{name}d.manifest
-cp -a %{SOURCE1002} %{buildroot}%{_datadir}/lib%{name}.manifest
-cp -a %{SOURCE1003} %{buildroot}%{_datadir}/lib%{name}-common.manifest
-
-%post
-/sbin/ldconfig
-chmod u+s %{_bindir}/%{name}d
-getent group gumd > /dev/null || /usr/sbin/groupadd -r gumd
-
-
-%postun -p /sbin/ldconfig
-
-
-%files -n lib%{name}-common
-%defattr(-,root,root,-)
-%manifest %{_datadir}/lib%{name}-common.manifest
-%{_libdir}/lib%{name}-common*.so.*
-
-
-%files -n lib%{name}-common-devel
-%defattr(-,root,root,-)
-%{_includedir}/%{name}/common/*
-%{_libdir}/lib%{name}-common*.so
-%{_libdir}/pkgconfig/lib%{name}-common.pc
-%config(noreplace) %{_sysconfdir}/gum.conf
-%if %{dbus_type} != "p2p"
-%{_datadir}/dbus-1/interfaces/*UserManagement*.xml
-%endif
-
-
-%files -n %{name}d
-%defattr(-,root,root,-)
-%manifest %{_datadir}/%{name}d.manifest
-%doc AUTHORS COPYING.LIB INSTALL NEWS README
-%{_bindir}/%{name}d
-%if %{dbus_type} == "session"
-%dir %{_datadir}/dbus-1/services
-%{_datadir}/dbus-1/services/*UserManagement*.service
-%else if %{dbus_type} == "system"
-%dir %{_datadir}/dbus-1/system-services
-%{_datadir}/dbus-1/system-services/*UserManagement*.service
-%dir %{_sysconfdir}/dbus-1
-%dir %{_sysconfdir}/dbus-1/system.d
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/gumd-dbus.conf
-%endif
-
-
-%files -n %{name}d-devel
-%defattr(-,root,root,-)
-%{_libdir}/pkgconfig/%{name}d.pc
-
-
-%files -n lib%{name}
-%defattr(-,root,root,-)
-%manifest %{_datadir}/lib%{name}.manifest
-%{_libdir}/lib%{name}.so.*
-
-
-%files -n lib%{name}-devel
-%defattr(-,root,root,-)
-%{_includedir}/%{name}/*.h
-%{_libdir}/lib%{name}.so
-%{_libdir}/pkgconfig/lib%{name}.pc
-%{_bindir}/%{name}-example
-
-
-%files doc
-%defattr(-,root,root,-)
-%{_datadir}/gtk-doc/html/gumd/*

diff --git a/packaging/gumd.manifest b/packaging/gumd.manifest
deleted file mode 100644 (file)
index 75b0fa5..0000000
--- a/packaging/gumd.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-    <request>
-        <domain name="_"/>
-    </request>
-</manifest>

diff --git a/packaging/libgum-common.manifest b/packaging/libgum-common.manifest
deleted file mode 100644 (file)
index 58f314b..0000000
--- a/packaging/libgum-common.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-    <request>
-        <domain name="_"/> 
-    </request>
-</manifest>

diff --git a/packaging/libgum.manifest b/packaging/libgum.manifest
deleted file mode 100644 (file)
index 58f314b..0000000
--- a/packaging/libgum.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-    <request>
-        <domain name="_"/> 
-    </request>
-</manifest>

diff --git a/tools/prepare-tizen.sh b/tools/prepare-tizen.sh
index ca9b4c8..27801fe 100755 (executable)
--- a/tools/prepare-tizen.sh
+++ b/tools/prepare-tizen.sh
@@ -14,14 +14,8 @@ echo "CURR dir = $currdir"
 
 mkdir -p $2 && \
 cd $2 && \
-git rm -r *; rm -rf packaging;
+git rm -r *; rm -f packaging;
 tar -xzvf $currdir/$1 -C $2 --strip-components 1 && \
-mkdir -p packaging && \
-cd packaging && \
-ln -s ../dists/rpm/tizen/packaging/gum-tizen.spec && \
-ln -s ../dists/rpm/tizen/packaging/gum-tizen.changes && \
-ln -s ../dists/rpm/tizen/packaging/gumd.manifest && \
-ln -s ../dists/rpm/tizen/packaging/libgum.manifest && \
-ln -s ../dists/rpm/tizen/packaging/libgum-common.manifest && \
-cd .. && git add -f *;
+ln -s dists/rpm/tizen/packaging && \
+git add -f *;
 cp $currdir/.gitignore $2/;