I have made the following changes intended for : CE:MW:Shared / oneshot Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/7531 Thank You, aard [This message was auto-generated] --- Request # 7531: Messages from BOSS: State: review at 2012-12-13T10:46:31 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:aard:branches:CE:MW:Shared / oneshot -> CE:MW:Shared / oneshot changes files: -------------- --- oneshot.changes +++ oneshot.changes @@ -0,0 +1,3 @@ +* Thu Dec 13 2012 Bernd Wachter <[email protected]> - 0.2 +- Fix packaging macros + old: ---- oneshot-0.1.tar.gz new: ---- oneshot-0.2.tar.gz spec files: ----------- --- oneshot.spec +++ oneshot.spec @@ -4,14 +4,14 @@ %define _system_groupadd() getent group %{1} >/dev/null || groupadd -r %{1} Name: oneshot -Version: 0.1 +Version: 0.2 Release: 1 Summary: Hooks run on first start BuildArch: noarch Group: System/Base License: GPLv2 Source0: %{name}-%{version}.tar.gz -URL: https://github.com/organizations/nemomobile +URL: https://github.com/nemomobile/oneshot BuildRequires: qt-qmake, grep, systemd Requires(pre): /usr/bin/getent, /usr/sbin/groupadd Requires: /usr/bin/getent, /bin/ln, /bin/touch, /bin/sed, /bin/grep, /usr/sbin/usermod @@ -22,15 +22,15 @@ %files %defattr(-,root,root,-) -%config %{_sysconfdir}/rpm/macros/* -%attr (775, -, -) %{_bindir}/* +%config %{_sysconfdir}/rpm/* +%attr (755, -, -) %{_bindir}/* %{_sysconfdir}/oneshot.d/ %dir %{_sysconfdir}/oneshot.d/ %dir %{_sysconfdir}/oneshot.d/0 %dir %attr(775, -, oneshot) %{_sysconfdir}/oneshot.d/default/ %dir %{_sysconfdir}/oneshot.d/group.d %dir %{_oneshotdir} -%attr (775, -, -) %{_oneshotdir}/* +%attr (755, -, -) %{_oneshotdir}/* %{_libdir}/systemd/user/oneshot-user.service %{_libdir}/systemd/user/xorg.target.wants/oneshot-user.service %{_unitdir}/oneshot-root.service other changes: -------------- ++++++ oneshot-0.1.tar.gz -> oneshot-0.2.tar.gz --- macros/macros.oneshot +++ macros/macros.oneshot @@ -1,6 +1,6 @@ -%define _oneshot_requires_post /usr/bin/getent, /bin/ln, /bin/touch, /bin/sed, /bin/grep, /etc/login.defs, /usr/bin/add-oneshot -%define _oneshot_requires_pre /usr/bin/getent, /usr/sbin/groupadd -%define _oneshot_groupadd_requires_pre %_oneshot_requires_pre -%define _oneshot_groupadd_requires_post %_oneshot_requires_post, /usr/sbin/groupadd, /usr/bin/groupadd-user +%_oneshot_requires_post Requires(post): /usr/bin/getent, /bin/ln, /bin/touch, /bin/sed, /bin/grep, /etc/login.defs, /usr/bin/add-oneshot +%_oneshot_requires_pre Requires(pre): /usr/bin/getent, /usr/sbin/groupadd +%_oneshot_groupadd_requires_pre %_oneshot_requires_pre +%_oneshot_groupadd_requires_post %_oneshot_requires_post, /usr/sbin/groupadd, /usr/bin/groupadd-user -%define _oneshotdir %{_libdir}/oneshot.d \ No newline at end of file +%_oneshotdir %{_libdir}/oneshot.d --- macros/macros.oneshot-generic +++ macros/macros.oneshot-generic @@ -1,2 +1,2 @@ %define _default_uid %(grep "^UID_MIN" /etc/login.defs | tr -s " " | cut -d " " -f2) -%define _system_groupadd() getent group %{1} >/dev/null || groupadd -r %{1} \ No newline at end of file +%_system_groupadd() getent group %{1} >/dev/null || groupadd -r %{1} --- oneshot.pro +++ oneshot.pro @@ -13,6 +13,6 @@ oneshot.path = $$(ONESHOTDIR) macros.files = macros/* -macros.path = /etc/rpm/macros +macros.path = /etc/rpm/ -INSTALLS += scripts services userservices oneshot macros \ No newline at end of file +INSTALLS += scripts services userservices oneshot macros --- rpm/oneshot.spec +++ rpm/oneshot.spec @@ -11,7 +11,7 @@ Group: System/Base License: GPLv2 Source0: %{name}-%{version}.tar.gz -URL: https://github.com/organizations/nemomobile +URL: https://github.com/nemomobile/oneshot BuildRequires: qt-qmake, grep, systemd Requires(pre): /usr/bin/getent, /usr/sbin/groupadd Requires: /usr/bin/getent, /bin/ln, /bin/touch, /bin/sed, /bin/grep, /usr/sbin/usermod @@ -22,15 +22,15 @@ %files %defattr(-,root,root,-) -%config %{_sysconfdir}/rpm/macros/* -%attr (775, -, -) %{_bindir}/* +%config %{_sysconfdir}/rpm/* +%attr (755, -, -) %{_bindir}/* %{_sysconfdir}/oneshot.d/ %dir %{_sysconfdir}/oneshot.d/ %dir %{_sysconfdir}/oneshot.d/0 %dir %attr(775, -, oneshot) %{_sysconfdir}/oneshot.d/default/ %dir %{_sysconfdir}/oneshot.d/group.d %dir %{_oneshotdir} -%attr (775, -, -) %{_oneshotdir}/* +%attr (755, -, -) %{_oneshotdir}/* %{_libdir}/systemd/user/oneshot-user.service %{_libdir}/systemd/user/xorg.target.wants/oneshot-user.service %{_unitdir}/oneshot-root.service
