[meego-packaging] [meego-commits] 6813: Changes to Trunk:Testing/sample-media

[Anas Nashif]

Chris,
my concern now is that we are doing this sample media handling twice, at least on netbook where sample media is installed during firstboot. Having those scripts will enable this again during the boot process if I am not mistaken, we need to pick just one method for doing this.

Anas

On 2010-08-18, at 7:01 PM, Chris Ferron wrote:

> Hi,
> I have made the following changes to sample-media in project Trunk:Testing. Please review and accept ASAP.
> 
> Thank You,
> Chris Ferron
> 
> [This message was auto-generated]
> 
> ---
> 
> Request #6813:
> 
>  submit:   home:ceferron:branches:Trunk:Testing/sample-media(r11)(cleanup) -> Trunk:Testing/sample-media
> 
> 
> Message:
>     made changes based on comments on orig commit
> 
> State:   new          2010-08-18T05:51:44 ceferron
> Comment: None
> 
> 
> 
> changes files:
> --------------
> --- sample-media.changes
> +++ sample-media.changes
> @@ -0,0 +1,8 @@
> +* Wed Aug 18 2010 Chris E Ferron <chris.e.ferron at intel.com> - 0.1
> +- Corrected script issues what was putting an media dir in home. 
> +- fixed dup macro sections in spec. 
> +
> +* Tue Aug 17 2010 Chris E Ferron <chris.e.ferron at intel.com> - 0.1
> +- added desktop file and script to autostart to move media to $HOME/media from /usr/share/sample-media
> +- fixes BMC#5242
> +
> 
> new:
> ----
>  sample-media-install.desktop
>  sample-media-install.sh
> 
> spec files:
> -----------
> --- sample-media.spec
> +++ sample-media.spec
> @@ -1,6 +1,6 @@
> # 
> # Do not Edit! Generated by:
> -# spectacle version 0.13
> +# spectacle version 0.18
> # 
> # >> macros
> # << macros
> @@ -12,16 +12,15 @@
> Group:      System/Desktop
> License:    Creative Commons
> BuildArch:  noarch
> -URL:        http://moblin.org/
> +URL:        http://meego.com/
> Source0:    sample-media-0.1.tar
> -NoSource: 0
> +Source1:    sample-media-install.sh
> +Source2:    sample-media-install.desktop
> Source100:  sample-media.yaml
> 
> -BuildRoot:  %{_tmppath}/%{name}-%{version}-build
> 
> %description
> -Pictures, Videos, Music samples for moblin
> -
> +Pictures, Videos, Music samples for meego
> 
> 
> 
> @@ -31,27 +30,31 @@
> # >> setup
> # << setup
> 
> -%build
> # >> build pre
> # << build pre
> 
> -
> +%build
> 
> # >> build post
> # << build post
> +
> %install
> rm -rf %{buildroot}
> # >> install pre
> # << install pre
> -# Please write install script under ">> install post"
> 
> # >> install post
> +rm -rf %{buildroot}
> +
> mkdir -p %{buildroot}%{_datadir}/sample-media
> -cp -a . %{buildroot}/usr/share/sample-media
> -# << install post
> +mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart/
> +mkdir -p %{buildroot}%{_bindir}
> 
> -%clean
> -rm -rf %{buildroot}
> +cp -a . %{buildroot}%{_datadir}/sample-media
> +install -m 755 %{SOURCE1} %{buildroot}%{_bindir}
> +install %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/autostart/ 
> +
> +# << install post
> 
> 
> 
> @@ -63,6 +66,8 @@
> # >> files
> %dir %{_datadir}/sample-media
> %{_datadir}/sample-media/*
> +%{_bindir}/sample-media-install.sh
> +%{_sysconfdir}/xdg/autostart/sample-media*
> # << files
> 
> 
> 
> other changes:
> --------------
> 
> ++++++ sample-media-install.desktop (new)
> --- sample-media-install.desktop
> +++ sample-media-install.desktop
> +[Desktop Entry]
> +Name=Sample Media Install 
> +Exec=/usr/bin/sample-media-install.sh 
> 
> ++++++ sample-media-install.sh (new)
> --- sample-media-install.sh
> +++ sample-media-install.sh
> +#!/bin/sh 
> +
> +cp -r /usr/share/sample-media $HOME/
> +
> +mkdir -p $HOME/.config/autostart
> +cat > $HOME/.config/autostart/sample-media-install.desktop <<EOF
> +[Desktop Entry]
> +Name=Sample Media Install
> +EOF
> +
> 
> ++++++ sample-media.yaml
> --- sample-media.yaml
> +++ sample-media.yaml
> @@ -4,13 +4,13 @@
> Release: 1
> Group: System/Desktop
> License: Creative Commons
> -URL: http://moblin.org/
> -BuildArch: noarch
> -
> -Description: |
> -    Pictures, Videos, Music samples for moblin
> -
> +URL: http://meego.com/
> Sources:
>     - sample-media-0.1.tar
> -Builder: none
> +    - sample-media-install.sh
> +    - sample-media-install.desktop
> +Description: Pictures, Videos, Music samples for meego
> +
> Configure: none
> +Builder: none
> +BuildArch: noarch
> 
> _______________________________________________
> Meego-commits mailing list
> Meego-commits at meego.com
> http://lists.meego.com/listinfo/meego-commits