Browse Source

upstart:
- update to 1.12.1
- add -devel subpackage
- add BR: dconf-devel

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8559 ec354946-7b23-47d6-9f5a-488ba84defc7

daisuke 10 years ago
parent
commit
925dccd9f7
1 changed files with 48 additions and 13 deletions
  1. 48 13
      u/upstart/upstart-vl.spec

+ 48 - 13
u/upstart/upstart-vl.spec

@@ -1,6 +1,6 @@
 Name:           upstart
-Version:        1.6
-Release:        2%{?_dist_release}
+Version:        1.12.1
+Release:        1%{?_dist_release}
 Summary:        An event-driven init system
 Summary(ja):    イベントドリブン型 init システム
 
@@ -10,7 +10,7 @@ URL:            http://launchpad.net/upstart
 
 Source0:        http://launchpad.net/upstart/1.x/%{version}/+download/upstart-%{version}.tar.gz
 Source1:        init-system-dbus.conf
-Patch1:         upstart-telinit.patch
+#Patch1:         upstart-telinit.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Obsoletes: SysVinit < 2.88
@@ -20,7 +20,8 @@ BuildRequires:  dbus-devel >= 1.2.16
 BuildRequires:  libnih-devel >= 1.0.1
 BuildRequires:  json-c-devel >= 0.10
 BuildRequires:  libudev-devel
-Requires:      initscripts >= 8.90.4
+BuildRequires:  dconf-devel
+Requires:       initscripts >= 8.90.4
 
 %description
 Upstart is an event-based replacement for the /sbin/init daemon which
@@ -32,9 +33,17 @@ Upstart はイベントドリブン型の /sbin/init デーモンです。OSブ
 タスクやサービスの開始やシャットダウン時の終了およびそれらの管理を担
 当します。
 
+%package devel
+Summary: Development files for upstart
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Development files for upstart
+
 %prep
 %setup -q
-%patch1 -p1 -b .u
+#%patch1 -p1 -b .u
 
 %build
 %configure --sbindir=/sbin --libdir=/%{_lib}
@@ -51,6 +60,9 @@ install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/init/
 # install upstart-{socket,udev}-bridge.conf
 install -m 644 extra/conf/*.conf %{buildroot}/%{_sysconfdir}/init/
 
+# remove unneeded files
+rm %{buildroot}/%{_lib}/*.{a,la}
+
 %find_lang %{name}
 
 %check
@@ -73,6 +85,7 @@ rm -rf %{buildroot}
 %doc HACKING
 %{_sysconfdir}/init/
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/Upstart.conf
+/%{_lib}/libupstart.so.*
 /sbin/halt
 /sbin/init
 /sbin/initctl
@@ -88,14 +101,36 @@ rm -rf %{buildroot}
 /sbin/reload
 /sbin/upstart-socket-bridge
 /sbin/upstart-udev-bridge
+/sbin/upstart-dbus-bridge
+/sbin/upstart-dconf-bridge
+/sbin/upstart-event-bridge
+/sbin/upstart-file-bridge
+/sbin/upstart-local-bridge
+%{_bindir}/upstart-monitor
 %{_bindir}/init-checkconf
 %{_bindir}/initctl2dot
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
+%dir %{_datadir}/upstart
+%{_datadir}/upstart/icons/*.svg
+%dir %{_datadir}/upstart/sessions
+%{_datadir}/upstart/sessions/*
 %{_mandir}/man5/init.5.gz
 %{_mandir}/man5/inittab.5.gz
 %{_mandir}/man7/*.7*
 %{_mandir}/man8/*.8*
 
+%files devel
+%defattr(-,root,root,-)
+/%{_lib}/libupstart.so
+%{_includedir}/upstart*
+%{_prefix}/lib/pkgconfig/*.pc
+
 %changelog
+* Sun Jun 15 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 1.12.1-1
+- update to 1.12.1
+- add BR: dconf-devel
+
 * Wed Nov 28 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.6-2
 - install upstart-{socket,udev}-bridge.conf
 
@@ -186,29 +221,29 @@ rm -rf %{buildroot}
 * Thu Apr 03 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-14
 - Change bug report email address to fedora-devel-list@redhat.com
 
-* Thu Mar 14 2008 Bill Nottingham <notting@redhat.com> - 0.3.9-13
+* Fri Mar 14 2008 Bill Nottingham <notting@redhat.com> - 0.3.9-13
 - Ignore rpm temporary files of the foo;<somehex> format
 - Make ignores of .rpm{new,orig,save} match only at the end of the name
 
-* Wed Mar 13 2008 Bill Nottingham <notting@redhat.com> - 0.3.9-12
+* Thu Mar 13 2008 Bill Nottingham <notting@redhat.com> - 0.3.9-12
 - forgot about rpmorig too (ugh)
 
-* Wed Mar 13 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-11
+* Thu Mar 13 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-11
 - Make logd a noreplace
 
-* Wed Mar 13 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-10
+* Thu Mar 13 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-10
 - Add patch to ignore .rpm{new,save} files
 
-* Sun Mar 03 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-9
+* Mon Mar 03 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-9
 - Remove automake dependency, build Makefile.in changes into patch
 
-* Sun Mar 03 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-8
+* Mon Mar 03 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-8
 - Run automake after patching
 
-* Sun Mar 03 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-7
+* Mon Mar 03 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-7
 - Added BuildRequires: automake
 
-* Sun Mar 03 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-6
+* Mon Mar 03 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-6
 - Added patch to allow runtime tty changes
 
 * Fri Feb 15 2008 Casey Dahlin <cjdahlin@ncsu.edu> - 0.3.9-5