[meego-commits] 14541: Changes to Trunk:Testing/pulseaudio-modules-n900
Vivian Zhang
no_reply at build.meego.com
Sat Mar 5 09:21:02 UTC 2011
Hi,
I have made the following changes to pulseaudio-modules-n900 in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Vivian Zhang
[This message was auto-generated]
---
Request #14541:
submit: devel:multimedia/pulseaudio-modules-n900(r5) -> Trunk:Testing/pulseaudio-modules-n900
Message:
Enable mainvolume module to partial fix volume control issue (BMC #8108); Also removed unnecessary ldconfigs and corrected spelling in spec
State: new 2011-03-05T01:20:56 vivian
Comment: None
changes files:
--------------
--- pulseaudio-modules-n900.changes
+++ pulseaudio-modules-n900.changes
@@ -0,0 +1,8 @@
+* Fri Mar 4 2011 Sami Sirkia <sami.sirkia at cybercom.com> - 0.9.19.0.11
+- Partial fix for BMC#8108: [N900] Volume control does not work
+ Enabled mainvolume module in build and added as separate rpm.
+- Removed unnecessary ldconfigs
+- Got rid of many %excludes with '%configure --disable-static'
+- Changed Group: Multimedia/PulseAudio
+- Corrected spelling of PulseAudio
+
old:
----
pulseaudio-modules-n900-dont-build-main-volume.patch
spec files:
-----------
--- pulseaudio-modules-n900.spec
+++ pulseaudio-modules-n900.spec
@@ -1,24 +1,22 @@
#
# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.22git
+# Generated by: spectacle version 0.22
#
# >> macros
# << macros
-%define keepstatic 1
Name: pulseaudio-modules-n900
-Summary: Pulseaudio modules for Nokia N900 handset
+Summary: PulseAudio modules for Nokia N900 handset
Version: 0.9.19.0.11
Release: 0
-Group: Multimedia/Pulseaudio
+Group: Multimedia/PulseAudio
License: LGPLv2.1+
ExclusiveArch: %arm
URL: http://meego.gitorious.org/maemo-multimedia/pulseaudio-modules-meego
Source0: maemo-multimedia-pulseaudio-modules-meego-0.9.19.0-11_released.tar.gz
Source100: pulseaudio-modules-n900.yaml
-Patch0: %{name}-dont-build-main-volume.patch
-Patch1: %{name}-include-call-state-tracker_h.patch
-Patch2: %{name}-cmtspeech-ofono.patch
+Patch0: %{name}-include-call-state-tracker_h.patch
+Patch1: %{name}-cmtspeech-ofono.patch
BuildRequires: pkgconfig(check)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(pulsecore)
@@ -27,70 +25,77 @@
%description
-pulseaudio modules for Nokia N900 handset
+PulseAudio modules for Nokia N900 handset.
%package devel
-Summary: Development files for MeeGo pulseaudio modules for N900
+Summary: Development files for MeeGo PulseAudio modules for N900
Group: Development/Libraries
Requires: %{name}-common = %{version}-%{release}
Requires: %{name}-music = %{version}-%{release}
Requires: %{name}-record = %{version}-%{release}
Requires: %{name}-voice = %{version}-%{release}
Requires: %{name}-cmtspeech = %{version}-%{release}
+Requires: %{name}-mainvolume = %{version}-%{release}
%description devel
-This package contains development headers for MeeGo pulseaudio modules
+This package contains development headers for MeeGo PulseAudio modules
%package common
-Summary: Common libs for the MeeGo Pulseaudio modules
-Group: System/Libraries
+Summary: Common libs for the MeeGo PulseAudio modules
+Group: Multimedia/PulseAudio
%description common
-This contains common libs for the MeeGo Pulseaudio modules.
+This contains common libs for the MeeGo PulseAudio modules.
%package music
-Summary: Music module for pulseaudio
-Group: System/Libraries
+Summary: Music module for PulseAudio
+Group: Multimedia/PulseAudio
Requires: %{name}-common = %{version}-%{release}
%description music
-This contains music module for MeeGo Pulseaudio
+This contains music module for MeeGo PulseAudio
%package record
-Summary: Cmtspeech module for pulseaudio
-Group: System/Libraries
+Summary: Cmtspeech module for PulseAudio
+Group: Multimedia/PulseAudio
Requires: %{name}-common = %{version}-%{release}
%description record
-This contains record module for MeeGo Pulseaudio
+This contains record module for MeeGo PulseAudio
%package voice
-Summary: Voice module for pulseaudio
-Group: System/Libraries
+Summary: Voice module for PulseAudio
+Group: Multimedia/PulseAudio
Requires: %{name}-common = %{version}-%{release}
%description voice
-This contains voice module for MeeGo Pulseaudio
+This contains voice module for MeeGo PulseAudio
%package cmtspeech
-Summary: Cmtspeech module for pulseaudio
-Group: System/Libraries
+Summary: Cmtspeech module for PulseAudio
+Group: Multimedia/PulseAudio
Requires: %{name}-common = %{version}-%{release}
%description cmtspeech
-This contains cmtspeech module for MeeGo Pulseaudio with Nokia N900 modem
+This contains cmtspeech module for MeeGo PulseAudio with Nokia N900 modem
+
+%package mainvolume
+Summary: Mainvolume module for PulseAudio
+Group: Multimedia/PulseAudio
+Requires: %{name}-common = %{version}-%{release}
+
+%description mainvolume
+This contains mainvolume module for MeeGo PulseAudio
%prep
%setup -q -n maemo-multimedia-pulseaudio-modules-meego
-# %{name}-dont-build-main-volume.patch
-%patch0 -p1
# %{name}-include-call-state-tracker_h.patch
-%patch1 -p1
+%patch0 -p1
# %{name}-cmtspeech-ofono.patch
-%patch2 -p1
+%patch1 -p1
# >> setup
# << setup
@@ -99,7 +104,7 @@
autoreconf -vfi
# << build pre
-%configure
+%configure --disable-static
make %{?jobs:-j%jobs}
# >> build post
@@ -134,59 +139,22 @@
-%post common
-# >> post common
-/sbin/ldconfig
-# << post common
-
-%postun common
-# >> postun common
-/sbin/ldconfig
-# << postun common
-
-
-%post music
-# >> post music
-/sbin/ldconfig
-# << post music
-
-%postun music
-# >> postun music
-/sbin/ldconfig
-# << postun music
-
-
-%post record
-# >> post record
-/sbin/ldconfig
-# << post record
-
-%postun record
-# >> postun record
-/sbin/ldconfig
-# << postun record
-
-
-%post voice
-# >> post voice
-/sbin/ldconfig
-# << post voice
-
-%postun voice
-# >> postun voice
-/sbin/ldconfig
-# << postun voice
-
-
-%post cmtspeech
-# >> post cmtspeech
-/sbin/ldconfig
-# << post cmtspeech
-
-%postun cmtspeech
-# >> postun cmtspeech
-/sbin/ldconfig
-# << postun cmtspeech
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -194,12 +162,6 @@
%defattr(-,root,root,-)
# >> files devel
%{_includedir}/pulse-modules-headers/modules/meego/*
-%exclude %{_libdir}/pulse-0.9.19/modules/libmeego-common.a
-%exclude %{_libdir}/pulse-0.9.19/modules/module-meego-music.a
-%exclude %{_libdir}/pulse-0.9.19/modules/module-meego-record.a
-%exclude %{_libdir}/pulse-0.9.19/modules/module-meego-voice.a
-%exclude %{_libdir}/pulse-0.9.19/modules/module-meego-cmtspeech.a
-%exclude %{_libdir}/pulse-0.9.19/modules/module-meego-test.a
%exclude %{_libdir}/pulse-0.9.19/modules/module-meego-test.so
# << files devel
@@ -233,3 +195,9 @@
%{_libdir}/pulse-0.9.19/modules/module-meego-cmtspeech.so
# << files cmtspeech
+%files mainvolume
+%defattr(-,root,root,-)
+# >> files mainvolume
+%{_libdir}/pulse-0.9.19/modules/module-meego-mainvolume.so
+# << files mainvolume
+
other changes:
--------------
++++++ pulseaudio-modules-n900.yaml
--- pulseaudio-modules-n900.yaml
+++ pulseaudio-modules-n900.yaml
@@ -1,17 +1,16 @@
Name: pulseaudio-modules-n900
-Summary: Pulseaudio modules for Nokia N900 handset
+Summary: PulseAudio modules for Nokia N900 handset
Version: 0.9.19.0.11
Release: 0
-Group: Multimedia/Pulseaudio
+Group: Multimedia/PulseAudio
License: LGPLv2.1+
URL: http://meego.gitorious.org/maemo-multimedia/pulseaudio-modules-meego
Sources:
- maemo-multimedia-pulseaudio-modules-meego-0.9.19.0-11_released.tar.gz
Patches:
- - "%{name}-dont-build-main-volume.patch"
- "%{name}-include-call-state-tracker_h.patch"
- "%{name}-cmtspeech-ofono.patch"
-Description: pulseaudio modules for Nokia N900 handset
+Description: PulseAudio modules for Nokia N900 handset.
ExclusiveArch: "%arm"
PkgBR:
- libcmtspeechdata-devel
@@ -25,46 +24,54 @@
NoFiles: yes
SubPackages:
- Name: devel
- Summary: Development files for MeeGo pulseaudio modules for N900
+ Summary: Development files for MeeGo PulseAudio modules for N900
Group: Development/Libraries
- Description: This package contains development headers for MeeGo pulseaudio modules
+ Description: This package contains development headers for MeeGo PulseAudio modules
Requires:
- "%{name}-common = %{version}-%{release}"
- "%{name}-music = %{version}-%{release}"
- "%{name}-record = %{version}-%{release}"
- "%{name}-voice = %{version}-%{release}"
- "%{name}-cmtspeech = %{version}-%{release}"
+ - "%{name}-mainvolume = %{version}-%{release}"
- Name: common
- Summary: Common libs for the MeeGo Pulseaudio modules
- Group: System/Libraries
- Description: This contains common libs for the MeeGo Pulseaudio modules.
+ Summary: Common libs for the MeeGo PulseAudio modules
+ Group: Multimedia/PulseAudio
+ Description: This contains common libs for the MeeGo PulseAudio modules.
- Name: music
- Summary: Music module for pulseaudio
- Group: System/Libraries
- Description: This contains music module for MeeGo Pulseaudio
+ Summary: Music module for PulseAudio
+ Group: Multimedia/PulseAudio
+ Description: This contains music module for MeeGo PulseAudio
Requires:
- "%{name}-common = %{version}-%{release}"
- Name: record
- Summary: Cmtspeech module for pulseaudio
- Group: System/Libraries
- Description: This contains record module for MeeGo Pulseaudio
+ Summary: Cmtspeech module for PulseAudio
+ Group: Multimedia/PulseAudio
+ Description: This contains record module for MeeGo PulseAudio
Requires:
- "%{name}-common = %{version}-%{release}"
- Name: voice
- Summary: Voice module for pulseaudio
- Group: System/Libraries
- Description: This contains voice module for MeeGo Pulseaudio
+ Summary: Voice module for PulseAudio
+ Group: Multimedia/PulseAudio
+ Description: This contains voice module for MeeGo PulseAudio
Requires:
- "%{name}-common = %{version}-%{release}"
- Name: cmtspeech
- Summary: Cmtspeech module for pulseaudio
- Group: System/Libraries
- Description: This contains cmtspeech module for MeeGo Pulseaudio with Nokia N900 modem
+ Summary: Cmtspeech module for PulseAudio
+ Group: Multimedia/PulseAudio
+ Description: This contains cmtspeech module for MeeGo PulseAudio with Nokia N900 modem
+ Requires:
+ - "%{name}-common = %{version}-%{release}"
+
+ - Name: mainvolume
+ Summary: Mainvolume module for PulseAudio
+ Group: Multimedia/PulseAudio
+ Description: This contains mainvolume module for MeeGo PulseAudio
Requires:
- "%{name}-common = %{version}-%{release}"
++++++ deleted files:
--- pulseaudio-modules-n900-dont-build-main-volume.patch
More information about the MeeGo-commits
mailing list