From 14bb5d032fdcce64668b87a163c7011eb567f3f1 Mon Sep 17 00:00:00 2001 From: Imran Zaman Date: Mon, 16 Dec 2013 11:14:05 +0200 Subject: [PATCH] added manifest files and fixed spec files --- dists/rpm/gum-suse.spec | 12 ++++++-- dists/rpm/{ => tizen/packaging}/gum-tizen.changes | 0 dists/rpm/{ => tizen/packaging}/gum-tizen.spec | 36 +++++++++++++++-------- dists/rpm/tizen/packaging/gumd.manifest | 5 ++++ dists/rpm/tizen/packaging/libgum-common.manifest | 5 ++++ dists/rpm/tizen/packaging/libgum.manifest | 5 ++++ packaging | 1 + packaging/gum-tizen.changes | 1 - packaging/gum-tizen.spec | 1 - 9 files changed, 49 insertions(+), 17 deletions(-) rename dists/rpm/{ => tizen/packaging}/gum-tizen.changes (100%) rename dists/rpm/{ => tizen/packaging}/gum-tizen.spec (79%) create mode 100644 dists/rpm/tizen/packaging/gumd.manifest create mode 100644 dists/rpm/tizen/packaging/libgum-common.manifest create mode 100644 dists/rpm/tizen/packaging/libgum.manifest create mode 120000 packaging delete mode 120000 packaging/gum-tizen.changes delete mode 120000 packaging/gum-tizen.spec diff --git a/dists/rpm/gum-suse.spec b/dists/rpm/gum-suse.spec index a6c4c28..48cf982 100644 --- a/dists/rpm/gum-suse.spec +++ b/dists/rpm/gum-suse.spec @@ -130,18 +130,25 @@ groupadd -f -r gumd %{_libdir}/lib%{name}-common*.so %{_libdir}/lib%{name}-common*.la %{_libdir}/pkgconfig/lib%{name}-common.pc +%config(noreplace) %{_sysconfdir}/gum.conf %if %{dbus_type} != "p2p" %{_datadir}/dbus-1/interfaces/*UserManagement*.xml %endif -%config(noreplace) %{_sysconfdir}/gum.conf %files -n %{name}d %defattr(-,root,root,-) %doc AUTHORS COPYING.LIB INSTALL NEWS README %{_bindir}/%{name}d -%if %{dbus_type} != "p2p" +%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 @@ -162,6 +169,7 @@ groupadd -f -r gumd %{_libdir}/pkgconfig/lib%{name}.pc %{_bindir}/%{name}-example + %changelog * Mon Sep 02 2013 Imran Zaman - Initial RPM packaging diff --git a/dists/rpm/gum-tizen.changes b/dists/rpm/tizen/packaging/gum-tizen.changes similarity index 100% rename from dists/rpm/gum-tizen.changes rename to dists/rpm/tizen/packaging/gum-tizen.changes diff --git a/dists/rpm/gum-tizen.spec b/dists/rpm/tizen/packaging/gum-tizen.spec similarity index 79% rename from dists/rpm/gum-tizen.spec rename to dists/rpm/tizen/packaging/gum-tizen.spec index 63a5f8a..80046ed 100644 --- a/dists/rpm/gum-tizen.spec +++ b/dists/rpm/tizen/packaging/gum-tizen.spec @@ -11,6 +11,9 @@ Release: 1 Group: System/Libraries License: LGPL-2.1+ Source: %{name}-%{version}.tar.gz +Source1001: %{name}d.manifest +Source1002: lib%{name}.manifest +Source1002: lib%{name}-common.manifest %if %{dbus_type} != "p2p" Requires: dbus-1 %endif @@ -90,41 +93,40 @@ Requires: lib%{name}-common-devel = %{version}-%{release} %description -n lib%{name}-devel %{summary}. + %prep %setup -q -n %{name}-%{version} -if [ -f = "gtk-doc.make" ] -then -rm gtk-doc.make -fi -touch gtk-doc.make -autoreconf -f -i + %build %if %{debug_build} == 1 -%configure --enable-dbus-type=%{dbus_type} --enable-debug +%autogen --enable-dbus-type=%{dbus_type} %{_enable_debug} %else -%configure --enable-dbus-type=%{dbus_type} +%autogen --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.* @@ -133,18 +135,26 @@ getent group gumd > /dev/null || /usr/sbin/groupadd -r gumd %{_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 -%config(noreplace) %{_sysconfdir}/gum.conf %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} != "p2p" +%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 @@ -155,9 +165,9 @@ getent group gumd > /dev/null || /usr/sbin/groupadd -r gumd %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 diff --git a/dists/rpm/tizen/packaging/gumd.manifest b/dists/rpm/tizen/packaging/gumd.manifest new file mode 100644 index 0000000..75b0fa5 --- /dev/null +++ b/dists/rpm/tizen/packaging/gumd.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/dists/rpm/tizen/packaging/libgum-common.manifest b/dists/rpm/tizen/packaging/libgum-common.manifest new file mode 100644 index 0000000..58f314b --- /dev/null +++ b/dists/rpm/tizen/packaging/libgum-common.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/dists/rpm/tizen/packaging/libgum.manifest b/dists/rpm/tizen/packaging/libgum.manifest new file mode 100644 index 0000000..58f314b --- /dev/null +++ b/dists/rpm/tizen/packaging/libgum.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging b/packaging new file mode 120000 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 120000 index a0a55fb..0000000 --- a/packaging/gum-tizen.changes +++ /dev/null @@ -1 +0,0 @@ -../dists/rpm/gum-tizen.changes \ No newline at end of file diff --git a/packaging/gum-tizen.spec b/packaging/gum-tizen.spec deleted file mode 120000 index 50c8962..0000000 --- a/packaging/gum-tizen.spec +++ /dev/null @@ -1 +0,0 @@ -../dists/rpm/gum-tizen.spec \ No newline at end of file -- 2.7.4