> +Provides:   libboardname.so

this shouldn't be needed....

> -# >> install post
> +%preun
> +systemctl stop boardname.service
> +
>  %post
>  systemctl daemon-reload
> -# << install post
> +systemctl reload-or-try-restart boardname.service
>
>  %postun
>  systemctl daemon-reload

this was omitted for a reason: boardname is a oneshot service, it's
not really needed.

why is there a yaml file for this in the first place? this spec is so small...


On Fri, Jun 24, 2011 at 2:36 PM, Ulf Hofemeier <[email protected]> wrote:
> Hi,
> I have made the following changes to boardname in project Trunk:Testing. 
> Please review and accept ASAP.
>
> Thank You,
> Ulf Hofemeier
>
> [This message was auto-generated]
>
> ---
>
> Request #21508:
>
>  submit:   devel:resourcepolicy/boardname(r1) -> Trunk:Testing/boardname
>
>
> Message:
>    None
>
> State:   new          2011-06-24T14:36:37 ulf
> Comment: None
>
>
>
> changes files:
> --------------
>
> spec files:
> -----------
> --- boardname.spec
> +++ boardname.spec
> @@ -17,8 +17,12 @@
>  Source100:  boardname.yaml
>  Requires:   coreutils
>  Requires:   grep
> +Requires:   systemd
> +Requires(preun): systemd
>  Requires(post):   systemd
>  Requires(postun): systemd
> +Provides:   libboardname.so
> +
>
>  %description
>  This tool allows multiple applications to determine board/skew specific
> @@ -32,6 +36,7 @@
>
>  %prep
>  %setup -q -n %{name}-%{version}
> +
>  # >> setup
>  # << setup
>
> @@ -39,39 +44,45 @@
>  # >> build pre
>  # << build pre
>
> -make %{?jobs:-j%jobs}
>
> +make %{?jobs:-j%jobs}
>
>  # >> build post
>  # << build post
>  %install
> -%make_install
> -
> +rm -rf %{buildroot}
>  # >> install pre
>  # << install pre
> +%make_install
> +
> +# >> install post
>  mkdir -p %{buildroot}/%{_lib}/systemd/system/sysinit.target.wants
>  install -D -m 0644 %SOURCE1 ${RPM_BUILD_ROOT}/%{_lib}/systemd/system/
>  mkdir -p %{buildroot}/%{_lib}/systemd/system/sysinit.target.wants/
>  ln -s ../boardname.service 
> %{buildroot}/%{_lib}/systemd/system/sysinit.target.wants/boardname.service
> +# << install post
>
>
> -# >> install post
> +%preun
> +systemctl stop boardname.service
> +
>  %post
>  systemctl daemon-reload
> -# << install post
> +systemctl reload-or-try-restart boardname.service
>
>  %postun
>  systemctl daemon-reload
>
> -# >> files
> +
>  %files
>  %defattr(-,root,root,-)
>  /sbin/boardname
>  /%{_lib}/systemd/system/boardname.service
>  /%{_lib}/systemd/system/sysinit.target.wants/boardname.service
> -%{_usr}/include/boardname/boardname.h
> -%{_usr}/%{_lib}/boardname/libboardname.so
> +%{_includedir}/boardname/boardname.h
> +%{_libdir}/boardname/libboardname.so
>  %{_libdir}/pkgconfig/boardname.pc
> +# >> files
>  # << files
>
>
>
> other changes:
> --------------
>
> ++++++ boardname.yaml
> --- boardname.yaml
> +++ boardname.yaml
> @@ -10,24 +10,25 @@
>         required to parse the output of boardname to determine appropriate
>         workaround. Vendors can force boardname override values at shipping.
>  Sources    :
> -    - boardname-%{version}-tar.bz2
> +    - boardname-%{version}.tar.bz2
>     - boardname.service
>
> +Provides:
> +    - libboardname.so
> +
>  Configure: none
> -Builder: none
> +Builder: make
>  License: GPLv2
> +URL: http://meego.gitorious.org/meego-os-base/boardname
>
>  Requires:
>     - coreutils
>     - grep
> -RequiresPost:
> -    - systemd
> -RequiresPostUn:
> -    - systemd
>  Files:
>     - "/sbin/boardname"
>     - "/%{_lib}/systemd/system/boardname.service"
>     - "/%{_lib}/systemd/system/sysinit.target.wants/boardname.service"
> -    - "%{_usr}/include/boardname/boardname.h"
> -    - "%{_usr}/%{_lib}/boardname/libboardname.so"
> +    - "%{_includedir}/boardname/boardname.h"
> +    - "%{_libdir}/boardname/libboardname.so"
> +    - "%{_libdir}/pkgconfig/boardname.pc"
>
>
> _______________________________________________
> MeeGo-commits mailing list
> [email protected]
> http://lists.meego.com/listinfo/meego-commits
>
_______________________________________________
MeeGo-packaging mailing list
[email protected]
http://lists.meego.com/listinfo/meego-packaging

Reply via email to