summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packaging/vconf.changes6
-rwxr-xr-xpackaging/vconf.spec38
2 files changed, 6 insertions, 38 deletions
diff --git a/packaging/vconf.changes b/packaging/vconf.changes
index 3ed4453..7dae74e 100644
--- a/packaging/vconf.changes
+++ b/packaging/vconf.changes
@@ -1,12 +1,12 @@
-* Wed Jun 26 2013 Maciej Wereski <m.wereski@partner.samsung.com>
-- Improve path dependency
-
* Fri Jul 05 2013 Junfeng Dong <junfeng.dong@intel.com> accepted/tizen/20130627.194918@56c355e
- make vconf-setup service after local-fs.target
* Thu Jun 27 2013 Rusty Lynch <rusty.lynch@intel.com> submit/tizen/20130620.090141@6700abc
- Remove ghost ref to nonexisting var-run.mount
+* Wed Jun 26 2013 Maciej Wereski <m.wereski@partner.samsung.com>
+- Improve path dependency
+
* Wed Jun 12 2013 Victor Hakoun <victor.hakoun@eurogiciel.fr> accepted/tizen/20130604.123334@ee4fcd1
- Fix possible memory leak
- Fix string manipulation in x86_64 runtime
diff --git a/packaging/vconf.spec b/packaging/vconf.spec
index ee3e3a3..6631f40 100755
--- a/packaging/vconf.spec
+++ b/packaging/vconf.spec
@@ -3,7 +3,7 @@ Summary: Configuration system library
Version: 0.2.45
Release: 3
Group: System/Libraries
-License: Apache License, Version 2.0
+License: Apache-2.0
Source0: %{name}-%{version}.tar.gz
Source1: vconf-setup.service
Source2: vconf-setup.conf
@@ -20,7 +20,6 @@ Configuration system library
%package devel
Summary: Vconf (devel)
-Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig(glib-2.0)
Requires: vconf = %{version}-%{release}
@@ -31,7 +30,6 @@ Vconf library (devel)
%package keys-devel
Summary: Vconf (devel)
-Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: vconf = %{version}-%{release}
Requires: vconf-internal-keys-devel
@@ -49,24 +47,14 @@ cp %{SOURCE1001} .
make %{?jobs:-j%jobs}
%install
-rm -rf %{buildroot}
%make_install
-
-mkdir -p %{buildroot}/etc/rc.d/rc3.d
-mkdir -p %{buildroot}/etc/rc.d/rc4.d
-ln -sf /etc/rc.d/init.d/vconf-init %{buildroot}/etc/rc.d/rc3.d/S04vconf-init
-ln -sf /etc/rc.d/init.d/vconf-init %{buildroot}/etc/rc.d/rc4.d/S04vconf-init
mkdir -p %{buildroot}/opt/var/kdb/db
mkdir -p %{buildroot}/opt/var/kdb/db/.backup
-mkdir -p %{buildroot}/tmp
-touch %{buildroot}/tmp/vconf-initialized
mkdir -p %{buildroot}%{_unitdir}/basic.target.wants
mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d
install -m0644 %SOURCE1 %{buildroot}%{_unitdir}/
install -m0644 %SOURCE2 %{buildroot}%{_prefix}/lib/tmpfiles.d/
ln -sf ../vconf-setup.service %{buildroot}%{_unitdir}/basic.target.wants/
-mkdir -p %{buildroot}/usr/share/license
-install LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
%post
/sbin/ldconfig
@@ -78,21 +66,18 @@ systemctl daemon-reload
%files
%manifest %{name}.manifest
+%license LICENSE.APLv2
%defattr(-,root,root,-)
-%attr(755,root,root) %{_sysconfdir}/rc.d/init.d/vconf-init
-%{_sysconfdir}/rc.d/rc3.d/S04vconf-init
-%{_sysconfdir}/rc.d/rc4.d/S04vconf-init
%attr(755,root,root) %{_sysconfdir}/preconf.d/vconf-setup
%{_bindir}/vconftool
+%{_bindir}/vconf-init
%config(missingok) %attr(644,root,root) /opt/var/kdb/kdb_first_boot
%{_libdir}/*.so.*
%dir %attr(777,root,root) /opt/var/kdb/db
%dir %attr(777,root,root) /opt/var/kdb/db/.backup
-/tmp/vconf-initialized
%{_unitdir}/basic.target.wants/vconf-setup.service
%{_unitdir}/vconf-setup.service
%{_prefix}/lib/tmpfiles.d/vconf-setup.conf
-/usr/share/license/%{name}
%files devel
%manifest %{name}.manifest
@@ -106,20 +91,3 @@ systemctl daemon-reload
%defattr(-,root,root,-)
%{_includedir}/vconf/vconf-keys.h
-%changelog
-* Tue Oct 23 2012 - SeungYeup Kim <sy2004.kim@samsung.com>
-- Add thread safe code
-
-* Tue Sep 18 2012 - SeungYeup Kim <sy2004.kim@samsung.com>
-- Add 4 public keys (Browser User Agent)
-
-* Tue Aug 28 2012 - SeungYeup Kim <sy2004.kim@samsung.com>
-- Remove memory leak
-- Remove use after free
-
-* Tue Aug 14 2012 - Hyungdeuk Kim <hd3.kim@samsung.com>
-- Fix issues related prevent
-- Fix warning msg at build time
-
-* Mon Jul 23 2012 - SeungYeup Kim <sy2004.kim@samsung.com>
-- Enable -f option for force update