Merge and release upstream version 1.2.0

Change-Id: I67d44eaab31feb30344f6a3ca219734699929734

diff --cc libsmack/libsmack.c
Simple merge

diff --cc libsmack/libsmack.sym
Simple merge

diff --cc libsmack/sys/smack.h
Simple merge

diff --cc packaging/smack.changes
index 49299fc,0000000..1e68e08
mode 100644,000000..100644
--- 1/packaging/smack.changes
--- /dev/null
+++ b/packaging/smack.changes
@@@ -1,23 -1,0 +1,26 @@@
++* Fri May 16 2016 Rafal Krypa <r.krypa@samsung.com>
++- Merge upstream version 1.2.0
++
 +* Mon Feb 16 2015 Rafal Krypa <r.krypa@samsung.com>
 +- Merge upstream version 1.1.0
 +
 +* Thu Aug 9 2013 Jarkko Sakkinen <jarkko.sakkinen@intel.com>
 +- Added .gbs.conf for upstream tracking and bumped version 1.0.1.
 +
 +* Thu Aug 8 2013 Jarkko Sakkinen <jarkko.sakkinen@intel.com>
 +- Removed "/smack" from smack.spec. It's not used anymore and causes RPMLINT error.
 +
 +* Fri May 17 2013 Anas Nashif <anas.nashif@intel.com> c9b1e5d
 +- Update code from upstream
 +
 +* Thu Mar 21 2013 Patrick McCarty <patrick.mccarty@linux.intel.com> ddddc70
 +- Disable smack.mount and smack.service
 +
 +* Mon Mar 18 2013 Anas Nashif <anas.nashif@intel.com> accepted/trunk/20130108.195935@d5c7f4d
 +- Fixed package group and split library
 +
 +* Tue Jan 08 2013 Patrick McCarty <patrick.mccarty@linux.intel.com> 669bb1b
 +- libsmack: add functions for getting and setting labels from files.
 +
 +* Mon Jan 07 2013 Patrick McCarty <patrick.mccarty@linux.intel.com> 36d3fa3
 +- Add Tizen packaging spec file

diff --cc packaging/smack.spec
index 2458105,0000000..d0a546f
mode 100644,000000..100644
--- 1/packaging/smack.spec
--- /dev/null
+++ b/packaging/smack.spec
@@@ -1,75 -1,0 +1,75 @@@
- Version:    1.1.0
 +Name:       smack
++Version:    1.2.0
 +Release:    1
 +Summary:    Selection of tools for developers working with Smack
 +Group:      Security/Access Control
 +License:    LGPL-2.1 and GPL-2.0
 +URL:        https://github.com/smack-team/smack
 +Source0:    %{name}-%{version}.tar.gz
 +Source1001:   smack.manifest
 +BuildRequires: automake
 +BuildRequires: autoconf
 +BuildRequires: libtool
 +BuildRequires: pkg-config
 +
 +%description
 +Tools provided to load and unload rules from the kernel and query the policy
 +
 +%package devel
 +Summary:    Development headers and libs for libsmack
 +Group:      Development/Libraries
 +Requires:   libsmack = %{version}
 +
 +%description devel
 +Standard header files for use when developing Smack enabled applications
 +
 +%package -n libsmack
 +Summary:    Library allows applications to work with Smack
 +Group:      Security/Access Control
 +
 +%description -n libsmack
 +Library allows applications to work with Smack.
 +
 +%prep
 +%setup -q
 +cp %{SOURCE1001} .
 +
 +%build
 +%reconfigure --with-systemdsystemunitdir=%{_unitdir}
 +
 +make %{?_smp_mflags}
 +
 +%install
 +%make_install
 +install -d %{buildroot}%{_sysconfdir}/smack/accesses.d
 +install -d %{buildroot}%{_sysconfdir}/smack/cipso.d
 +install -d %{buildroot}%{_sysconfdir}/smack/netlabel.d
 +
 +%post -p /sbin/ldconfig -n libsmack
 +
 +%postun -p /sbin/ldconfig -n libsmack
 +
 +%docs_package
 +
 +%files -n libsmack
 +%manifest %{name}.manifest
 +%defattr(644,root,root,755)
 +%license COPYING
 +%{_libdir}/libsmack.so.*
 +
 +%files devel
 +%manifest %{name}.manifest
 +%defattr(644,root,root,755)
 +%{_includedir}/sys/smack.h
 +%{_libdir}/libsmack.so
 +%{_libdir}/pkgconfig/libsmack.pc
 +
 +%files
 +%manifest %{name}.manifest
 +%defattr(644,root,root,755)
 +%{_sysconfdir}/smack
 +%{_sysconfdir}/smack/accesses.d
 +%{_sysconfdir}/smack/cipso.d
 +%{_sysconfdir}/smack/netlabel.d
 +%attr(755,root,root) %{_bindir}/*
 +