From: Imran Zaman Date: Wed, 12 Feb 2014 16:56:50 +0000 (+0200) Subject: Simplified gumd packages X-Git-Tag: accepted/tizen/generic/20140213.094844^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Faccepted%2Ftizen_generic;p=platform%2Fupstream%2Fgumd.git Simplified gumd packages Change-Id: I6610c580ef643cf042d8d03fde72616a7f74aaba Signed-off-by: Imran Zaman --- diff --git a/.gitignore b/.gitignore index 4900283..7e1f673 100644 --- a/.gitignore +++ b/.gitignore @@ -26,12 +26,13 @@ m4/lt*.m4 *.gcda build-aux *dbus*gen* -src/common/gum.conf +src/daemon/gumd.conf src/daemon/gumd src/daemon/dbus/gumd-dbus.conf test/common/commontest test/daemon/daemontest test/lib/clienttest +test/data/services/org.tizen.SecurityAccounts.gUserManagement.service test/data/test-gumd-dbus.conf examples/gum-example stamp-h1 diff --git a/configure b/configure index d63356f..7199504 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for gumd 0.0.1. +# Generated by GNU Autoconf 2.68 for gumd 0.0.2. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -567,8 +567,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='gumd' PACKAGE_TARNAME='gumd' -PACKAGE_VERSION='0.0.1' -PACKAGE_STRING='gumd 0.0.1' +PACKAGE_VERSION='0.0.2' +PACKAGE_STRING='gumd 0.0.2' PACKAGE_BUGREPORT='' PACKAGE_URL='https://github.com/01org/gumd' @@ -1381,7 +1381,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gumd 0.0.1 to adapt to many kinds of systems. +\`configure' configures gumd 0.0.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1451,7 +1451,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gumd 0.0.1:";; + short | recursive ) echo "Configuration of gumd 0.0.2:";; esac cat <<\_ACEOF @@ -1608,7 +1608,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gumd configure 0.0.1 +gumd configure 0.0.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1973,7 +1973,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gumd $as_me 0.0.1, which was +It was created by gumd $as_me 0.0.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2832,7 +2832,7 @@ fi # Define the identity of the package. PACKAGE='gumd' - VERSION='0.0.1' + VERSION='0.0.2' cat >>confdefs.h <<_ACEOF @@ -13118,7 +13118,7 @@ LIBGUM_LIBS='$(GLIB_LIBS) $(GCOV_LIBS)' LIBGUM_INCLUDES='$(GUM_COMMON_INCLUDES)' -ac_config_files="$ac_config_files Makefile src/Makefile src/common/Makefile src/common/gum.conf src/common/libgum-common.pc src/common/libgum-common-uninstalled.pc src/common/dbus/Makefile src/daemon/gumd.pc src/daemon/gumd-uninstalled.pc src/daemon/Makefile src/daemon/dbus/Makefile src/daemon/dbus/services/org.tizen.SecurityAccounts.gUserManagement.service src/daemon/dbus/gumd-dbus.conf src/lib/Makefile src/lib/libgum.pc src/lib/libgum-uninstalled.pc docs/Makefile docs/version.xml test/Makefile test/common/Makefile test/daemon/Makefile test/lib/Makefile examples/Makefile" +ac_config_files="$ac_config_files Makefile src/Makefile src/common/Makefile src/common/dbus/Makefile src/daemon/Makefile src/daemon/dbus/Makefile src/daemon/dbus/services/org.tizen.SecurityAccounts.gUserManagement.service src/daemon/gumd.conf src/daemon/dbus/gumd-dbus.conf src/lib/Makefile src/lib/libgum.pc src/lib/libgum-uninstalled.pc docs/Makefile docs/version.xml test/Makefile test/common/Makefile test/daemon/Makefile test/lib/Makefile examples/Makefile" if test "x$enable_tests" = "xyes" ; then @@ -13709,7 +13709,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gumd $as_me 0.0.1, which was +This file was extended by gumd $as_me 0.0.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13776,7 +13776,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gumd config.status 0.0.1 +gumd config.status 0.0.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -14188,15 +14188,11 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/common/Makefile") CONFIG_FILES="$CONFIG_FILES src/common/Makefile" ;; - "src/common/gum.conf") CONFIG_FILES="$CONFIG_FILES src/common/gum.conf" ;; - "src/common/libgum-common.pc") CONFIG_FILES="$CONFIG_FILES src/common/libgum-common.pc" ;; - "src/common/libgum-common-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES src/common/libgum-common-uninstalled.pc" ;; "src/common/dbus/Makefile") CONFIG_FILES="$CONFIG_FILES src/common/dbus/Makefile" ;; - "src/daemon/gumd.pc") CONFIG_FILES="$CONFIG_FILES src/daemon/gumd.pc" ;; - "src/daemon/gumd-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES src/daemon/gumd-uninstalled.pc" ;; "src/daemon/Makefile") CONFIG_FILES="$CONFIG_FILES src/daemon/Makefile" ;; "src/daemon/dbus/Makefile") CONFIG_FILES="$CONFIG_FILES src/daemon/dbus/Makefile" ;; "src/daemon/dbus/services/org.tizen.SecurityAccounts.gUserManagement.service") CONFIG_FILES="$CONFIG_FILES src/daemon/dbus/services/org.tizen.SecurityAccounts.gUserManagement.service" ;; + "src/daemon/gumd.conf") CONFIG_FILES="$CONFIG_FILES src/daemon/gumd.conf" ;; "src/daemon/dbus/gumd-dbus.conf") CONFIG_FILES="$CONFIG_FILES src/daemon/dbus/gumd-dbus.conf" ;; "src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;; "src/lib/libgum.pc") CONFIG_FILES="$CONFIG_FILES src/lib/libgum.pc" ;; diff --git a/configure.ac b/configure.ac index 071c892..5730367 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.60]) -AC_INIT([gumd], [0.0.1],[],[],[https://github.com/01org/gumd]) +AC_INIT([gumd], [0.0.2],[],[],[https://github.com/01org/gumd]) AC_CONFIG_SRCDIR([src/daemon/main.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([build-aux]) @@ -284,15 +284,11 @@ AC_CONFIG_FILES([ Makefile src/Makefile src/common/Makefile -src/common/gum.conf -src/common/libgum-common.pc -src/common/libgum-common-uninstalled.pc src/common/dbus/Makefile -src/daemon/gumd.pc -src/daemon/gumd-uninstalled.pc src/daemon/Makefile src/daemon/dbus/Makefile src/daemon/dbus/services/org.tizen.SecurityAccounts.gUserManagement.service +src/daemon/gumd.conf src/daemon/dbus/gumd-dbus.conf src/lib/Makefile src/lib/libgum.pc diff --git a/dists/debian/changelog b/dists/debian/changelog index 642c8e5..07826c6 100644 --- a/dists/debian/changelog +++ b/dists/debian/changelog @@ -1,3 +1,9 @@ +gumd (0.0.2-1) unstable; urgency=low + + * Simplified gumd packages + + -- Imran Zaman Wed, 12 Feb 2014 10:24:53 +0300 + gum (0.0.1-1) unstable; urgency=low * Initial Release. diff --git a/dists/debian/control b/dists/debian/control index 458a05d..709425a 100644 --- a/dists/debian/control +++ b/dists/debian/control @@ -1,42 +1,25 @@ -Source: gum +Source: gumd Section: admin Priority: extra Maintainer: Imran Zaman Build-Depends: debhelper (>= 8.0.0), autotools-dev, pkg-config, libdbus-1-dev, gtk-doc-tools, libglib2.0-dev Standards-Version: 3.9.2 -Vcs-Git: https://github.com/otcshare/gum.git -Vcs-Browser: https://github.com/otcshare/gum +Vcs-Git: https://github.com/01org/gumd.git +Vcs-Browser: https://github.com/01org/gumd -Package: libgum-common +Package: libgum Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Common library for user management +Description: Client library for user management -Package: libgum-common-dev +Package: libgum-dev Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: development files for common library +Depends: ${shlibs:Depends}, ${misc:Depends}, libgum (= ${source:Version}) +Description: development files for client library Headers and libraries. Package: gumd Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libgum-common (= ${source:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libgum (= ${source:Version}) Description: User management daemon User management daemon provides interface to add/delete/update users/groups - -Package: gumd-dev -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: development files for daemon - -Package: libgum -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libgum-common (= ${source:Version}) -Description: Client library for user management - -Package: libgum-dev -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libgum-common-dev (= ${source:Version}) -Description: development files for client library - Headers and libraries. - diff --git a/dists/debian/copyright b/dists/debian/copyright index b7db0a7..c95fb06 100644 --- a/dists/debian/copyright +++ b/dists/debian/copyright @@ -1,9 +1,9 @@ Format: http://dep.debian.net/deps/dep5 -Upstream-Name: gum -Source: https://github.com/otcshare/gum +Upstream-Name: gumd +Source: https://github.com/01org/gumd Files: * -Copyright: 2013 Intel Corporation +Copyright: 2013 - 2014 Intel Corporation License: LGPL-2.1+ Files: debian/* diff --git a/dists/debian/gumd-dev.install b/dists/debian/gumd-dev.install deleted file mode 100644 index 2dfdeb5..0000000 --- a/dists/debian/gumd-dev.install +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/pkgconfig/gumd.pc diff --git a/dists/debian/gumd.install b/dists/debian/gumd.install index a3ca8c2..10c9484 100644 --- a/dists/debian/gumd.install +++ b/dists/debian/gumd.install @@ -1,2 +1,4 @@ /usr/bin/gumd -/usr/share/dbus-1/services/*UserManagement*.service \ No newline at end of file +/etc/gumd.conf +/usr/share/dbus-1/system-services/*UserManagement*.service +/etc/dbus-1/system.d/gumd-dbus.conf diff --git a/dists/debian/gumd.preinst b/dists/debian/gumd.preinst index 667700b..8cba018 100644 --- a/dists/debian/gumd.preinst +++ b/dists/debian/gumd.preinst @@ -1,5 +1,5 @@ #!/bin/sh -# preinst script for gum +# preinst script for gumd # # see: dh_installdeb(1) @@ -18,6 +18,7 @@ case "$1" in install) ;; upgrade) + cp -a /etc/gumd.conf /etc/gumd.conf.orig ;; abort-upgrade) diff --git a/dists/debian/libgum-common-dev.install b/dists/debian/libgum-common-dev.install deleted file mode 100644 index 946a946..0000000 --- a/dists/debian/libgum-common-dev.install +++ /dev/null @@ -1,5 +0,0 @@ -/usr/include/gum/common/* -/usr/lib/libgum-common*.so -/usr/lib/libgum-common*.la -/usr/lib/pkgconfig/libgum-common.pc -/usr/share/dbus-1/interfaces/*UserManagement*.xml diff --git a/dists/debian/libgum-common.install b/dists/debian/libgum-common.install deleted file mode 100644 index 5017b0e..0000000 --- a/dists/debian/libgum-common.install +++ /dev/null @@ -1,2 +0,0 @@ -/usr/lib/libgum-common.so.* -/etc/gum.conf \ No newline at end of file diff --git a/dists/debian/libgum-common.preinst b/dists/debian/libgum-common.preinst deleted file mode 100644 index 8b2e54e..0000000 --- a/dists/debian/libgum-common.preinst +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# preinst script for gumd -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `install' -# * `install' -# * `upgrade' -# * `abort-upgrade' -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - install) - ;; - upgrade) - cp -a /etc/gum.conf /etc/gum.conf.orig - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/dists/debian/libgum-dev.install b/dists/debian/libgum-dev.install index 3b6b695..e00d9f2 100644 --- a/dists/debian/libgum-dev.install +++ b/dists/debian/libgum-dev.install @@ -1,5 +1,6 @@ -/usr/include/gum/*.h -/usr/lib/libgum.so -/usr/lib/libgum.la +/usr/include/gum/* +/usr/lib/libgum*.so +/usr/lib/libgum*.la /usr/lib/pkgconfig/libgum.pc -/usr/bin/gum-example \ No newline at end of file +/usr/bin/gum-example +/usr/share/dbus-1/interfaces/*UserManagement*.xml \ No newline at end of file diff --git a/dists/debian/libgum.install b/dists/debian/libgum.install index 7530ddb..9be92ea 100644 --- a/dists/debian/libgum.install +++ b/dists/debian/libgum.install @@ -1 +1 @@ -/usr/lib/libgum.so.* \ No newline at end of file +/usr/lib/libgum*.so.* \ No newline at end of file diff --git a/dists/debian/rules b/dists/debian/rules index c1425f0..7a51285 100755 --- a/dists/debian/rules +++ b/dists/debian/rules @@ -10,10 +10,10 @@ export DH_VERBOSE=1 export DH_OPTIONS %: - dh $@ --parallel + dh $@ --parallel override_dh_auto_configure: - dh_auto_configure -- --enable-dbus-type=session + dh_auto_configure -- --enable-dbus-type=system override_dh_auto_test: - true + true diff --git a/dists/rpm/gum-suse.spec b/dists/rpm/gum-suse.spec index cf1c1a2..a85acf8 100644 --- a/dists/rpm/gum-suse.spec +++ b/dists/rpm/gum-suse.spec @@ -7,12 +7,13 @@ Name: gumd Summary: User management daemon and client library -Version: 0.0.1 +Version: 0.0.2 Release: 1 -Group: System/Libraries +Group: System/Daemons License: LGPL-2.1+ Source: %{name}-%{version}.tar.gz URL: https://github.com/01org/gumd +Requires: libgum = %{version}-%{release} %if %{dbus_type} != "p2p" Requires: dbus-1 %endif @@ -32,49 +33,9 @@ BuildRequires: pkgconfig(gmodule-2.0) %{summary}. -%package -n libgum-common -Summary: User management common library -Group: System/Libraries - - -%description -n libgum-common -%{summary}. - - -%package -n libgum-common-devel -Summary: Development files for user management common library -Group: Development/Libraries -Requires: libgum-common = %{version}-%{release} - - -%description -n libgum-common-devel -%{summary}. - - -%package %{name} -Summary: User management daemon -Group: System/Daemons -Requires: libgum-common = %{version}-%{release} - - -%description %{name} -%{summary}. - - -%package -n %{name}-devel -Summary: Development files for user management daemon -Group: Development/Daemons -Requires: %{name} = %{version}-%{release} -Requires: libgum-common-devel = %{version}-%{release} - -%description -n %{name}-devel -%{summary}. - - %package -n libgum Summary: User management client library Group: System/Libraries -Requires: libgum-common = %{version}-%{release} %description -n libgum @@ -85,7 +46,6 @@ Requires: libgum-common = %{version}-%{release} Summary: Development files for user management client library Group: Development/Libraries Requires: libgum = %{version}-%{release} -Requires: libgum-common-devel = %{version}-%{release} %description -n libgum-devel @@ -131,27 +91,28 @@ groupadd -f -r gumd %postun -p /sbin/ldconfig -%files -n libgum-common +%files -n libgum %defattr(-,root,root,-) -%{_libdir}/libgum-common*.so.* +%{_libdir}/libgum*.so.* -%files -n libgum-common-devel +%files -n libgum-devel %defattr(-,root,root,-) -%{_includedir}/gum/common/* -%{_libdir}/libgum-common*.so -%{_libdir}/libgum-common*.la -%{_libdir}/pkgconfig/libgum-common.pc -%config(noreplace) %{_sysconfdir}/gum.conf +%{_includedir}/gum/* +%{_libdir}/libgum*.so +%{_libdir}/libgum*.la +%{_libdir}/pkgconfig/libgum.pc %if %{dbus_type} != "p2p" %{_datadir}/dbus-1/interfaces/*UserManagement*.xml %endif +%{_bindir}/gum-example -%files %{name} +%files %defattr(-,root,root,-) %doc AUTHORS COPYING.LIB INSTALL NEWS README %{_bindir}/%{name} +%config(noreplace) %{_sysconfdir}/gumd.conf %if %{dbus_type} == "session" %dir %{_datadir}/dbus-1/services %{_datadir}/dbus-1/services/*UserManagement*.service @@ -164,31 +125,15 @@ groupadd -f -r gumd %endif -%files -n %{name}-devel -%defattr(-,root,root,-) -%{_libdir}/pkgconfig/%{name}.pc - - -%files -n libgum -%defattr(-,root,root,-) -%{_libdir}/libgum.so.* - - -%files -n libgum-devel -%defattr(-,root,root,-) -%{_includedir}/gum/*.h -%{_libdir}/libgum.so -%{_libdir}/libgum.la -%{_libdir}/pkgconfig/libgum.pc -%{_bindir}/gum-example - - %files doc %defattr(-,root,root,-) %{_datadir}/gtk-doc/html/gumd/* %changelog +* Wed Feb 12 2014 Imran Zaman +- Simplified gumd packages + * Mon Dec 23 2013 Imran Zaman - added test cases for error and dictionary objects - utilized dictionary functions for get/set key-value pairs diff --git a/dists/rpm/tizen/packaging/gumd.changes b/dists/rpm/tizen/packaging/gumd.changes index d205a93..d2b2d07 100644 --- a/dists/rpm/tizen/packaging/gumd.changes +++ b/dists/rpm/tizen/packaging/gumd.changes @@ -1,3 +1,12 @@ +* Wed Feb 12 2014 Imran Zaman +- Simplified gumd packages for Tizen and SUSE +- Simplified gumd packages +- fix uninstalled pkgconfig files + +* Fri Feb 07 2014 Patrick McCarty fe07066 +- Move the packaging files into the packaging/ directory, since a symlink with + the same name does not work with 'gbs build'. (DEVT-148) + * Fri Dec 27 2013 Imran Zaman - Obsoletes gum package as the package is renamed to gumd diff --git a/dists/rpm/tizen/packaging/gumd.spec b/dists/rpm/tizen/packaging/gumd.spec index 736e1e8..507a65b 100644 --- a/dists/rpm/tizen/packaging/gumd.spec +++ b/dists/rpm/tizen/packaging/gumd.spec @@ -6,16 +6,16 @@ Name: gumd Summary: User management daemon and client library -Version: 0.0.1 +Version: 0.0.2 Release: 1 -Group: System/Libraries +Group: System/Daemons License: LGPL-2.1+ Source: %{name}-%{version}.tar.gz URL: https://github.com/01org/gumd Source1001: %{name}.manifest Source1002: libgum.manifest -Source1003: libgum-common.manifest Obsoletes: gum +Requires: libgum = %{version}-%{release} %if %{dbus_type} != "p2p" Requires: dbus-1 %endif @@ -35,50 +35,9 @@ BuildRequires: pkgconfig(gmodule-2.0) %{summary}. -%package -n libgum-common -Summary: User management common library -Group: System/Libraries - - -%description -n libgum-common -%{summary}. - - -%package -n libgum-common-devel -Summary: Development files for user management common library -Group: Development/Libraries -Requires: libgum-common = %{version}-%{release} - - -%description -n libgum-common-devel -%{summary}. - - -%package %{name} -Summary: User management daemon -Group: System/Daemons -Requires: libgum-common = %{version}-%{release} - - -%description %{name} -%{summary}. - - -%package devel -Summary: Development files for user management daemon -Group: Development/Daemons -Requires: %{name} = %{version}-%{release} -Requires: libgum-common-devel = %{version}-%{release} - - -%description devel -%{summary}. - - %package -n libgum Summary: User management client library Group: System/Libraries -Requires: libgum-common = %{version}-%{release} %description -n libgum @@ -89,7 +48,6 @@ Requires: libgum-common = %{version}-%{release} Summary: Development files for user management client library Group: Development/Libraries Requires: libgum = %{version}-%{release} -Requires: libgum-common-devel = %{version}-%{release} %description -n libgum-devel @@ -117,6 +75,7 @@ Requires: libgum = %{version}-%{release} %configure --enable-dbus-type=%{dbus_type} %endif + make %{?_smp_mflags} @@ -125,7 +84,7 @@ rm -rf %{buildroot} %make_install 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 @@ -136,18 +95,18 @@ getent group gumd > /dev/null || /usr/sbin/groupadd -r gumd %postun -p /sbin/ldconfig -%files -n libgum-common +%files -n libgum %defattr(-,root,root,-) -%manifest %{_datadir}/libgum-common.manifest -%{_libdir}/libgum-common*.so.* +%manifest %{_datadir}/libgum.manifest +%{_libdir}/libgum*.so.* -%files -n libgum-common-devel +%files -n libgum-devel %defattr(-,root,root,-) -%{_includedir}/gum/common/* -%{_libdir}/libgum-common*.so -%{_libdir}/pkgconfig/libgum-common.pc -%config(noreplace) %{_sysconfdir}/gum.conf +%{_includedir}/gum/* +%{_libdir}/libgum*.so +%{_libdir}/pkgconfig/libgum.pc +%{_bindir}/gum-example %if %{dbus_type} != "p2p" %{_datadir}/dbus-1/interfaces/*UserManagement*.xml %endif @@ -158,6 +117,7 @@ getent group gumd > /dev/null || /usr/sbin/groupadd -r gumd %manifest %{_datadir}/%{name}.manifest %doc AUTHORS COPYING.LIB INSTALL NEWS README %{_bindir}/%{name} +%config(noreplace) %{_sysconfdir}/gumd.conf %if %{dbus_type} == "session" %dir %{_datadir}/dbus-1/services %{_datadir}/dbus-1/services/*UserManagement*.service @@ -170,25 +130,6 @@ getent group gumd > /dev/null || /usr/sbin/groupadd -r gumd %endif -%files devel -%defattr(-,root,root,-) -%{_libdir}/pkgconfig/%{name}.pc - - -%files -n libgum -%defattr(-,root,root,-) -%manifest %{_datadir}/libgum.manifest -%{_libdir}/libgum.so.* - - -%files -n libgum-devel -%defattr(-,root,root,-) -%{_includedir}/gum/*.h -%{_libdir}/libgum.so -%{_libdir}/pkgconfig/libgum.pc -%{_bindir}/gum-example - - %files doc %defattr(-,root,root,-) %{_datadir}/gtk-doc/html/gumd/* diff --git a/dists/rpm/tizen/packaging/libgum-common.manifest b/dists/rpm/tizen/packaging/libgum-common.manifest deleted file mode 100644 index 58f314b..0000000 --- a/dists/rpm/tizen/packaging/libgum-common.manifest +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/html/GumConfig.html b/docs/html/GumConfig.html index 9f69256..35643dd 100644 --- a/docs/html/GumConfig.html +++ b/docs/html/GumConfig.html @@ -87,7 +87,7 @@ for where the file is searched for.

-

Usage

+

Usage

Following code snippet demonstrates how to create and use config object: @@ -105,7 +105,7 @@ g_object_unref(config);

-

Where the configuration file is searched for

+

Where the configuration file is searched for

@@ -127,7 +127,7 @@ $(sysconfdir) + "gum.conf"

-

Example configuration file

+

Example configuration file

diff --git a/docs/html/GumDisposable.html b/docs/html/GumDisposable.html index 8e19247..ebcf46a 100644 --- a/docs/html/GumDisposable.html +++ b/docs/html/GumDisposable.html @@ -90,7 +90,7 @@ be required to destory after some period of inactivity.

-

Usage

+

Usage

Following code snippet demonstrates how to derive and use GumDisposable: diff --git a/docs/html/ch01.html b/docs/html/ch01.html index 53ccaf8..5ebd1b7 100644 --- a/docs/html/ch01.html +++ b/docs/html/ch01.html @@ -21,7 +21,7 @@

-Daemon (gumd) configuration

+Daemon (gumd) configuration
GumConfig — gum configuration information diff --git a/docs/html/ch02.html b/docs/html/ch02.html index 90c63a5..ae466bf 100644 --- a/docs/html/ch02.html +++ b/docs/html/ch02.html @@ -21,7 +21,7 @@

-Common

+Common
GumDictionary — a dictionary container holding string keys and variant diff --git a/docs/html/ch03.html b/docs/html/ch03.html index 82119a1..ea541d0 100644 --- a/docs/html/ch03.html +++ b/docs/html/ch03.html @@ -21,7 +21,7 @@

-Client library (libgum) interface

+Client library (libgum) interface
GumUser — provides interface for managing user's account diff --git a/docs/html/ch04.html b/docs/html/ch04.html index 3cb1ece..41f5e70 100644 --- a/docs/html/ch04.html +++ b/docs/html/ch04.html @@ -54,7 +54,7 @@

-Appendices

+Appendices

C

GumConfig, struct in GumConfig diff --git a/docs/html/ch05.html b/docs/html/ch05.html index 9cd4c63..bb0be4a 100644 --- a/docs/html/ch05.html +++ b/docs/html/ch05.html @@ -21,7 +21,7 @@

-Deprecated APIs

+Deprecated APIs
diff --git a/docs/html/gumd-examples.html b/docs/html/gumd-examples.html index 392920a..dea0c49 100644 --- a/docs/html/gumd-examples.html +++ b/docs/html/gumd-examples.html @@ -45,7 +45,7 @@

-

Add User

+

Add User

User can be added with flag --add-user:

@@ -74,7 +74,7 @@

-

Delete User

+

Delete User

User can be deleted with flag --delete-user:

@@ -89,7 +89,7 @@

-

Update User

+

Update User

User can be update with flag --update-user:

@@ -113,7 +113,7 @@

-

Get User

+

Get User

User data can be retrieved with flag --get-user:

@@ -128,7 +128,7 @@

-

Get User By Name

+

Get User By Name

User data can be retrieved with flag --get-user-by-name:

@@ -143,7 +143,7 @@

-

Add Group

+

Add Group

Group can be added with flag --add-group:

@@ -162,7 +162,7 @@

-

Delete Group

+

Delete Group

Group can be deleted with flag --delete-group:

@@ -177,7 +177,7 @@

-

Update Group

+

Update Group

Group can be updated with flag --udpate-group:

@@ -194,7 +194,7 @@

-

Get Group

+

Get Group

Group data can be retrieved with flag --get-group:

@@ -209,7 +209,7 @@

-

Get Group By Name

+

Get Group By Name

Group data can be retrieved with flag --get-group-by-name:

@@ -224,7 +224,7 @@

-

Add member To Group

+

Add member To Group

New member can be added to a group with flag --add-member:

@@ -240,7 +240,7 @@

-

Delete member From Group

+

Delete member From Group

A member can be removed from the group with flag --delete-member:

diff --git a/docs/html/index.html b/docs/html/index.html index 664eab2..8ba9124 100644 --- a/docs/html/index.html +++ b/docs/html/index.html @@ -15,7 +15,7 @@

This document discusses the details of user management - daemon (gumd) and client library (libgum) with version 0.0.1 + daemon (gumd) and client library (libgum) with version 0.0.2 .

diff --git a/docs/html/um-intro.html b/docs/html/um-intro.html index 5806d60..a8ac254 100644 --- a/docs/html/um-intro.html +++ b/docs/html/um-intro.html @@ -22,7 +22,7 @@
-

What is gumd/libgum?

+

What is gumd/libgum?

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/gumd.changes b/packaging/gumd.changes index df09877..d2b2d07 100644 --- a/packaging/gumd.changes +++ b/packaging/gumd.changes @@ -1,3 +1,8 @@ +* Wed Feb 12 2014 Imran Zaman +- Simplified gumd packages for Tizen and SUSE +- Simplified gumd packages +- fix uninstalled pkgconfig files + * Fri Feb 07 2014 Patrick McCarty fe07066 - Move the packaging files into the packaging/ directory, since a symlink with the same name does not work with 'gbs build'. (DEVT-148) @@ -13,7 +18,7 @@ - exclude external and generated dbus files from code coverage calculation * Fri Dec 20 2013 Imran Zaman -- Corrected spec and changes file names +- Corrected spec and changes file names * Fri Dec 20 2013 Imran Zaman - Removed dist spec packaging folder from main source tree diff --git a/packaging/gumd.spec b/packaging/gumd.spec index 736e1e8..507a65b 100644 --- a/packaging/gumd.spec +++ b/packaging/gumd.spec @@ -6,16 +6,16 @@ Name: gumd Summary: User management daemon and client library -Version: 0.0.1 +Version: 0.0.2 Release: 1 -Group: System/Libraries +Group: System/Daemons License: LGPL-2.1+ Source: %{name}-%{version}.tar.gz URL: https://github.com/01org/gumd Source1001: %{name}.manifest Source1002: libgum.manifest -Source1003: libgum-common.manifest Obsoletes: gum +Requires: libgum = %{version}-%{release} %if %{dbus_type} != "p2p" Requires: dbus-1 %endif @@ -35,50 +35,9 @@ BuildRequires: pkgconfig(gmodule-2.0) %{summary}. -%package -n libgum-common -Summary: User management common library -Group: System/Libraries - - -%description -n libgum-common -%{summary}. - - -%package -n libgum-common-devel -Summary: Development files for user management common library -Group: Development/Libraries -Requires: libgum-common = %{version}-%{release} - - -%description -n libgum-common-devel -%{summary}. - - -%package %{name} -Summary: User management daemon -Group: System/Daemons -Requires: libgum-common = %{version}-%{release} - - -%description %{name} -%{summary}. - - -%package devel -Summary: Development files for user management daemon -Group: Development/Daemons -Requires: %{name} = %{version}-%{release} -Requires: libgum-common-devel = %{version}-%{release} - - -%description devel -%{summary}. - - %package -n libgum Summary: User management client library Group: System/Libraries -Requires: libgum-common = %{version}-%{release} %description -n libgum @@ -89,7 +48,6 @@ Requires: libgum-common = %{version}-%{release} Summary: Development files for user management client library Group: Development/Libraries Requires: libgum = %{version}-%{release} -Requires: libgum-common-devel = %{version}-%{release} %description -n libgum-devel @@ -117,6 +75,7 @@ Requires: libgum = %{version}-%{release} %configure --enable-dbus-type=%{dbus_type} %endif + make %{?_smp_mflags} @@ -125,7 +84,7 @@ rm -rf %{buildroot} %make_install 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 @@ -136,18 +95,18 @@ getent group gumd > /dev/null || /usr/sbin/groupadd -r gumd %postun -p /sbin/ldconfig -%files -n libgum-common +%files -n libgum %defattr(-,root,root,-) -%manifest %{_datadir}/libgum-common.manifest -%{_libdir}/libgum-common*.so.* +%manifest %{_datadir}/libgum.manifest +%{_libdir}/libgum*.so.* -%files -n libgum-common-devel +%files -n libgum-devel %defattr(-,root,root,-) -%{_includedir}/gum/common/* -%{_libdir}/libgum-common*.so -%{_libdir}/pkgconfig/libgum-common.pc -%config(noreplace) %{_sysconfdir}/gum.conf +%{_includedir}/gum/* +%{_libdir}/libgum*.so +%{_libdir}/pkgconfig/libgum.pc +%{_bindir}/gum-example %if %{dbus_type} != "p2p" %{_datadir}/dbus-1/interfaces/*UserManagement*.xml %endif @@ -158,6 +117,7 @@ getent group gumd > /dev/null || /usr/sbin/groupadd -r gumd %manifest %{_datadir}/%{name}.manifest %doc AUTHORS COPYING.LIB INSTALL NEWS README %{_bindir}/%{name} +%config(noreplace) %{_sysconfdir}/gumd.conf %if %{dbus_type} == "session" %dir %{_datadir}/dbus-1/services %{_datadir}/dbus-1/services/*UserManagement*.service @@ -170,25 +130,6 @@ getent group gumd > /dev/null || /usr/sbin/groupadd -r gumd %endif -%files devel -%defattr(-,root,root,-) -%{_libdir}/pkgconfig/%{name}.pc - - -%files -n libgum -%defattr(-,root,root,-) -%manifest %{_datadir}/libgum.manifest -%{_libdir}/libgum.so.* - - -%files -n libgum-devel -%defattr(-,root,root,-) -%{_includedir}/gum/*.h -%{_libdir}/libgum.so -%{_libdir}/pkgconfig/libgum.pc -%{_bindir}/gum-example - - %files doc %defattr(-,root,root,-) %{_datadir}/gtk-doc/html/gumd/* diff --git a/packaging/libgum-common.manifest b/packaging/libgum-common.manifest deleted file mode 100644 index 75b0fa5..0000000 --- a/packaging/libgum-common.manifest +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/packaging/libgum.manifest b/packaging/libgum.manifest index 75b0fa5..58f314b 100644 --- a/packaging/libgum.manifest +++ b/packaging/libgum.manifest @@ -1,5 +1,5 @@ - + diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 86dcc48..1c5bf98 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -54,16 +54,9 @@ libgum_common_la_SOURCES = \ dist_libgum_common_la_SOURCES = \ $(NULL) -EXTRA_DIST = \ - libgum-common.pc.in \ - gum.conf.in \ +EXTRA_DIST = \ gum-dbus.h \ gum-defines.h -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libgum-common.pc - -sysconf_DATA = gum.conf - CLEANFILES = *.gcno *.gcda diff --git a/src/common/Makefile.in b/src/common/Makefile.in index af4f1f3..a3dc8b1 100644 --- a/src/common/Makefile.in +++ b/src/common/Makefile.in @@ -16,7 +16,6 @@ @SET_MAKE@ - VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -38,9 +37,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/common DIST_COMMON = $(libgum_common_include_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/gum.conf.in \ - $(srcdir)/libgum-common-uninstalled.pc.in \ - $(srcdir)/libgum-common.pc.in + $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gnu_make.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/libtool.m4 \ @@ -51,8 +48,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = gum.conf libgum-common.pc \ - libgum-common-uninstalled.pc +CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -81,8 +77,7 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \ - "$(DESTDIR)$(sysconfdir)" \ +am__installdirs = "$(DESTDIR)$(libdir)" \ "$(DESTDIR)$(libgum_common_includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = @@ -138,7 +133,6 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -DATA = $(pkgconfig_DATA) $(sysconf_DATA) HEADERS = $(libgum_common_include_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -381,14 +375,9 @@ dist_libgum_common_la_SOURCES = \ $(NULL) EXTRA_DIST = \ - libgum-common.pc.in \ - gum.conf.in \ gum-dbus.h \ gum-defines.h -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libgum-common.pc -sysconf_DATA = gum.conf CLEANFILES = *.gcno *.gcda all: all-recursive @@ -424,12 +413,6 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -gum.conf: $(top_builddir)/config.status $(srcdir)/gum.conf.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -libgum-common.pc: $(top_builddir)/config.status $(srcdir)/libgum-common.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -libgum-common-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/libgum-common-uninstalled.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @@ -580,42 +563,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -install-pkgconfigDATA: $(pkgconfig_DATA) - @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" - @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ - done - -uninstall-pkgconfigDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) -install-sysconfDATA: $(sysconf_DATA) - @$(NORMAL_INSTALL) - test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" - @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ - done - -uninstall-sysconfDATA: - @$(NORMAL_UNINSTALL) - @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir) install-libgum_common_includeHEADERS: $(libgum_common_include_HEADERS) @$(NORMAL_INSTALL) test -z "$(libgum_common_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libgum_common_includedir)" @@ -830,10 +777,10 @@ distdir: $(DISTFILES) done check-am: all-am check: check-recursive -all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) +all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(sysconfdir)" "$(DESTDIR)$(libgum_common_includedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libgum_common_includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -890,14 +837,13 @@ info: info-recursive info-am: -install-data-am: install-libgum_common_includeHEADERS \ - install-pkgconfigDATA +install-data-am: install-libgum_common_includeHEADERS install-dvi: install-dvi-recursive install-dvi-am: -install-exec-am: install-libLTLIBRARIES install-sysconfDATA +install-exec-am: install-libLTLIBRARIES install-html: install-html-recursive @@ -938,8 +884,7 @@ ps: ps-recursive ps-am: uninstall-am: uninstall-libLTLIBRARIES \ - uninstall-libgum_common_includeHEADERS uninstall-pkgconfigDATA \ - uninstall-sysconfDATA + uninstall-libgum_common_includeHEADERS .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -954,15 +899,13 @@ uninstall-am: uninstall-libLTLIBRARIES \ install-exec-am install-html install-html-am install-info \ install-info-am install-libLTLIBRARIES \ install-libgum_common_includeHEADERS install-man install-pdf \ - install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ - install-strip install-sysconfDATA installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ uninstall-libLTLIBRARIES \ - uninstall-libgum_common_includeHEADERS uninstall-pkgconfigDATA \ - uninstall-sysconfDATA + uninstall-libgum_common_includeHEADERS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/src/common/libgum-common-uninstalled.pc.in b/src/common/libgum-common-uninstalled.pc.in deleted file mode 100644 index 9173de8..0000000 --- a/src/common/libgum-common-uninstalled.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -# Nicked the idea/template for uninstalled development from gstreamer -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@abs_top_builddir@/include/gum - -Name: Gum common library -Description: User management common library, not installed -Version: @PACKAGE_VERSION@ -URL: @PACKAGE_URL@ -Requires: glib-2.0 >= 2.30 gio-2.0 gio-unix-2.0 gmodule-2.0 -Cflags: -I${includedir} \ No newline at end of file diff --git a/src/common/libgum-common.pc.in b/src/common/libgum-common.pc.in deleted file mode 100644 index ce72f28..0000000 --- a/src/common/libgum-common.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/gum - -Name: Gum common library -Description: User management common library -Version: @PACKAGE_VERSION@ -URL: @PACKAGE_URL@ -Requires: glib-2.0 >= 2.30 gio-2.0 gio-unix-2.0 gmodule-2.0 -Libs: -L${libdir} -lgum-common -Cflags: -I${includedir} - diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 5a385c7..262920e 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -27,10 +27,9 @@ gumd_LDADD = \ $(NULL) EXTRA_DIST = \ - gumd.pc.in + gumd.conf.in -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gumd.pc +sysconf_DATA = gumd.conf if SET_PERMISSIONS install-exec-hook: diff --git a/src/daemon/Makefile.in b/src/daemon/Makefile.in index a509bf5..1d1627b 100644 --- a/src/daemon/Makefile.in +++ b/src/daemon/Makefile.in @@ -38,7 +38,7 @@ host_triplet = @host@ bin_PROGRAMS = gumd$(EXEEXT) subdir = src/daemon DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/gumd-uninstalled.pc.in $(srcdir)/gumd.pc.in + $(srcdir)/gumd.conf.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gnu_make.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/libtool.m4 \ @@ -49,9 +49,9 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = gumd.pc gumd-uninstalled.pc +CONFIG_CLEAN_FILES = gumd.conf CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sysconfdir)" PROGRAMS = $(bin_PROGRAMS) am__objects_1 = am_gumd_OBJECTS = gumd-main.$(OBJEXT) gumd-gumd-daemon.$(OBJEXT) \ @@ -130,7 +130,7 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -DATA = $(pkgconfig_DATA) +DATA = $(sysconf_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -343,10 +343,9 @@ gumd_LDADD = \ $(NULL) EXTRA_DIST = \ - gumd.pc.in + gumd.conf.in -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gumd.pc +sysconf_DATA = gumd.conf CLEANFILES = *.gcno *.gcda all: all-recursive @@ -382,9 +381,7 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -gumd.pc: $(top_builddir)/config.status $(srcdir)/gumd.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -gumd-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/gumd-uninstalled.pc.in +gumd.conf: $(top_builddir)/config.status $(srcdir)/gumd.conf.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @@ -529,24 +526,24 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -install-pkgconfigDATA: $(pkgconfig_DATA) +install-sysconfDATA: $(sysconf_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" - @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" + @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ done | $(am__base_list) | \ while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \ done -uninstall-pkgconfigDATA: +uninstall-sysconfDATA: @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) + dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -746,7 +743,7 @@ check: check-recursive all-am: Makefile $(PROGRAMS) $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sysconfdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -803,13 +800,13 @@ info: info-recursive info-am: -install-data-am: install-pkgconfigDATA +install-data-am: install-dvi: install-dvi-recursive install-dvi-am: -install-exec-am: install-binPROGRAMS +install-exec-am: install-binPROGRAMS install-sysconfDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-exec-hook install-html: install-html-recursive @@ -850,7 +847,7 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-pkgconfigDATA +uninstall-am: uninstall-binPROGRAMS uninstall-sysconfDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-exec-am install-strip tags-recursive @@ -864,13 +861,13 @@ uninstall-am: uninstall-binPROGRAMS uninstall-pkgconfigDATA install-data-am install-dvi install-dvi-am install-exec \ install-exec-am install-exec-hook install-html install-html-am \ install-info install-info-am install-man install-pdf \ - install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ + install-pdf-am install-ps install-ps-am install-strip \ + install-sysconfDATA installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-pkgconfigDATA + uninstall-sysconfDATA @SET_PERMISSIONS_TRUE@install-exec-hook: diff --git a/src/daemon/dbus/gumd-dbus-server-p2p.c b/src/daemon/dbus/gumd-dbus-server-p2p.c index a451a29..283592e 100644 --- a/src/daemon/dbus/gumd-dbus-server-p2p.c +++ b/src/daemon/dbus/gumd-dbus-server-p2p.c @@ -28,6 +28,7 @@ #include #include #include +#include #include "common/gum-dbus.h" #include "common/gum-utils.h" diff --git a/src/daemon/gumd-uninstalled.pc.in b/src/daemon/gumd-uninstalled.pc.in deleted file mode 100644 index 0088ea0..0000000 --- a/src/daemon/gumd-uninstalled.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -# Nicked the idea/template for uninstalled development from gstreamer -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@abs_top_builddir@/include/gum - -Name: Gum daemon -Description: User management daemon, not installed -Version: @PACKAGE_VERSION@ -URL: @PACKAGE_URL@ -Requires: glib-2.0 >= 2.30 gio-2.0 gio-unix-2.0 gmodule-2.0 gum-common diff --git a/src/common/gum.conf.in b/src/daemon/gumd.conf.in similarity index 100% rename from src/common/gum.conf.in rename to src/daemon/gumd.conf.in diff --git a/src/daemon/gumd.pc.in b/src/daemon/gumd.pc.in deleted file mode 100644 index 7b57d5a..0000000 --- a/src/daemon/gumd.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: Gum daemon -Description: User management daemon -Version: @PACKAGE_VERSION@ -URL: @PACKAGE_URL@ -Requires: glib-2.0 >= 2.30 gio-2.0 gio-unix-2.0 gmodule-2.0 gum-common -Libs: -L${libdir} diff --git a/src/lib/libgum-uninstalled.pc.in b/src/lib/libgum-uninstalled.pc.in index 2e7f500..7241b39 100644 --- a/src/lib/libgum-uninstalled.pc.in +++ b/src/lib/libgum-uninstalled.pc.in @@ -9,4 +9,5 @@ Description: User management client library, not installed Version: @PACKAGE_VERSION@ URL: @PACKAGE_URL@ Requires: glib-2.0 >= 2.30 gio-2.0 gio-unix-2.0 gmodule-2.0 -Cflags: -I${includedir} \ No newline at end of file +Libs: @abs_top_builddir@/src/lib/libgum.la +Cflags: -I${includedir} diff --git a/src/lib/libgum.pc.in b/src/lib/libgum.pc.in index 4267d3a..a91e926 100644 --- a/src/lib/libgum.pc.in +++ b/src/lib/libgum.pc.in @@ -7,7 +7,7 @@ Name: Gum client library Description: User management client library Version: @PACKAGE_VERSION@ URL: @PACKAGE_URL@ -Requires: glib-2.0 >= 2.30 gio-2.0 gio-unix-2.0 gmodule-2.0 libgum-common +Requires: glib-2.0 >= 2.30 gio-2.0 gio-unix-2.0 gmodule-2.0 Libs: -L${libdir} -lgum Cflags: -I${includedir} diff --git a/tools/prepare-tizen.sh b/tools/prepare-tizen.sh index 27801fe..b14b97d 100755 --- a/tools/prepare-tizen.sh +++ b/tools/prepare-tizen.sh @@ -14,8 +14,12 @@ echo "CURR dir = $currdir" mkdir -p $2 && \ cd $2 && \ -git rm -r *; rm -f packaging; +git rm -r *; rm -rf packaging; tar -xzvf $currdir/$1 -C $2 --strip-components 1 && \ -ln -s dists/rpm/tizen/packaging && \ +mkdir -p packaging && \ +cp dists/rpm/tizen/packaging/gumd.spec packaging/ && \ +cp dists/rpm/tizen/packaging/gumd.manifest packaging/ && \ +cp dists/rpm/tizen/packaging/gumd.changes packaging/ && \ +cp dists/rpm/tizen/packaging/libgum.manifest packaging/ && \ git add -f *; cp $currdir/.gitignore $2/;