install dbus files in /etc

- create a devel sub-package
- cleanup spec with spec-cleaner

Change-Id: I891bb0b9eaba489451be4b705214972de8054e09

diff --git a/packaging/connman.changes b/packaging/connman.changes
new file mode 100644 (file)
index 0000000..0f47379
--- /dev/null
+++ b/packaging/connman.changes
@@ -0,0 +1,37 @@
+* Fri Jun 15 2012 Anas Nashif <anas.nashif@intel.com> F_Tizen_20120522_2@ebd552d
+- install dbus files in /etc
+
+* Thu Jun 14 2012 arron.wang <arron.wang@intel.com> F_Tizen_20120522_2@518b9fc
+- Build with connman test script
+
+* Thu May 31 2012 Danny Jeongseok Seo <S.Seo@samsung.com> F_Tizen_20120522_2@30fe470
+- Nitpick, file permission and clean up
+- Fix wifi_scan
+- Wi-Fi Enterprise SIM and AKA
+- Revise Wi-Fi enterprise to enable PEAP, TLS and TTLS
+- Fix telephony technology driver
+- ConnMan catch up to connman-stable 0.78.4
+- Update connman init script for supplicant 0.8
+
+* Wed May 30 2012 Ryan Ware <ryan.r.ware@intel.com> F_Tizen_20120522_2@29a9b6c
+- Add default Smack manifest for connman.spec
+
+* Tue May 22 2012 Prajwal Mohan <prajwal.karur.mohan@intel.com> F_Tizen_20120522_2@c05d425
+- Fixing copyright to 2012
+- Reverting Copyright file
+- Fixing Copyright file
+
+* Sun Apr 29 2012 Kim Kibum <kb0929.kim@samsung.com> F_Tizen_20120522_2@887b993
+- upload tizen1.0 source
+
+* Wed Mar 14 2012 Yan Yin <yan.yin@intel.com> F_Tizen_20120522_2@a93ce3e
+- update for beta universally
+
+* Fri Feb 10 2012 Danny Jeongseok Seo <s.seo@samsung.com> F_Tizen_20120522_2@9f0e4de
+- Release TIZEN beta
+
+* Fri Jan 06 2012 Kibum Kim <kb0929.kim@samsung.com> F_Tizen_20120522_2@43669ce
+- Git init
+[ Eunkyoung Kim ]
+- Initial empty repository
+

diff --git a/packaging/connman.spec b/packaging/connman.spec
index 6525819..e59195b 100644 (file)
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -1,34 +1,41 @@
-#sbs-git:pkgs/c/connman connman 0.78.4
-
-Name:       connman
-Summary:    Connection Manager
-Version:    0.78.4_81
-Release:    1
-Group:      System/Network
-License:    GNU General Public License version 2
-URL:        http://connman.net
-Source0:    %{name}-%{version}.tar.gz
-Source1001: packaging/connman.manifest
-BuildRequires:  pkgconfig(glib-2.0)
+Name:           connman
+Version:        0.78.4_81
+Release:        1
+License:        GNU General Public License version 2
+Summary:        Connection Manager
+Url:            http://connman.net
+Group:          System/Network
+Source0:        %{name}-%{version}.tar.gz
+Source1001:     packaging/connman.manifest
 BuildRequires:  pkgconfig(dbus-1)
-BuildRequires:  pkgconfig(xtables)
+BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libiptc)
+BuildRequires:  pkgconfig(xtables)
 
 %description
 Connection Manager provides a daemon for managing Internet connections
 within embedded devices running the Linux operating system.
 
 %package test
-Summary:    Test Scripts for Connection Manager
-Group:      Development/Tools
-Requires:   %{name} = %{version}-%{release}
-Requires:   dbus-python
-Requires:   pygobject2
-Requires:   python-xml
+Summary:        Test Scripts for Connection Manager
+Group:          Development/Tools
+Requires:       %{name} = %{version}-%{release}
+Requires:       dbus-python
+Requires:       pygobject2
+Requires:       python-xml
 
 %description test
 Scripts for testing Connman and its functionality
 
+
+%package devel
+Summary:        Development Files for connman
+Group:          Development/Tools
+Requires:       %{name} = %{version}-%{release}
+
+%description devel
+Header files and development files for connman.
+
 %prep
 %setup -q
 
@@ -46,53 +53,49 @@ cp %{SOURCE1001} .
             --enable-test
 
 
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 %make_install
 
-mkdir -p %{buildroot}/var/lib/connman
-cp resources/var/lib/connman/settings %{buildroot}/var/lib/connman/settings
-mkdir -p %{buildroot}/usr/share/dbus-1/services
-cp resources/usr/share/dbus-1/services/net.connman.service %{buildroot}/usr/share/dbus-1/services/net.connman.service
-mkdir -p %{buildroot}/usr/etc/connman
-cp src/main.conf %{buildroot}/usr/etc/connman/main.conf
-mkdir -p %{buildroot}/etc/rc.d/init.d
-cp resources/etc/rc.d/init.d/connman %{buildroot}/etc/rc.d/init.d/connman
-mkdir -p %{buildroot}/etc/rc.d/rc3.d
-ln -s ../init.d/connman %{buildroot}/etc/rc.d/rc3.d/S61connman
-mkdir -p %{buildroot}/etc/rc.d/rc5.d
-ln -s ../init.d/connman %{buildroot}/etc/rc.d/rc5.d/S61connman
-
-rm -rf %{buildroot}/usr/include/
-rm -rf %{buildroot}/usr/lib/pkgconfig/
-rm %{buildroot}/etc/dbus-1/system.d/*.conf
+mkdir -p %{buildroot}%{_localstatedir}/lib/connman
+cp resources/var/lib/connman/settings %{buildroot}%{_localstatedir}/lib/connman/settings
+mkdir -p %{buildroot}%{_datadir}/dbus-1/services
+cp resources/usr/share/dbus-1/services/net.connman.service %{buildroot}%{_datadir}/dbus-1/services/net.connman.service
+mkdir -p %{buildroot}%{_sysconfdir}/connman
+cp src/main.conf %{buildroot}%{_sysconfdir}/connman/main.conf
 
-mkdir -p %{buildroot}/usr/etc/dbus-1/system.d/
-cp src/connman.conf %{buildroot}/usr/etc/dbus-1/system.d/
+# FIXME: All of below has to go when systemd lands
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
+cp resources/etc/rc.d/init.d/connman %{buildroot}%{_sysconfdir}/rc.d/init.d/connman
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d
+ln -s ../init.d/connman %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S61connman
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc5.d
+ln -s ../init.d/connman %{buildroot}%{_sysconfdir}/rc.d/rc5.d/S61connman
 
+rm %{buildroot}%{_sysconfdir}/dbus-1/system.d/*.conf
 
-%post
-#Resource
-chmod 600 /var/lib/connman/settings
+mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d/
+cp src/connman.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/
 
 
 %files
 %manifest connman.manifest
-%defattr(-,root,root,-)
-#%doc AUTHORS COPYING INSTALL ChangeLog NEWS README
 %{_sbindir}/*
-%{_var}/lib/connman/settings
+%attr(600,root,root) %{_localstatedir}/lib/connman/settings
 %{_libdir}/connman/plugins/*.so
 %{_datadir}/dbus-1/services/*
-%{_prefix}/etc/dbus-1/system.d/*
-%{_prefix}/etc/connman/main.conf
-%{_prefix}/etc/dbus-1/system.d/*.conf
+%{_sysconfdir}/dbus-1/system.d/*
+%{_sysconfdir}/connman/main.conf
+%{_sysconfdir}/dbus-1/system.d/*.conf
 %{_sysconfdir}/rc.d/init.d/connman
 %{_sysconfdir}/rc.d/rc3.d/S61connman
 %{_sysconfdir}/rc.d/rc5.d/S61connman
 
 %files test
-%defattr(-,root,root,-)
 %{_libdir}/%{name}/test/*
+
+
+%files devel
+%{_includedir}/*
+%{_libdir}/pkgconfig/*.pc