I'm responsible for that version being 1.0 for the time of that one
earlier commit. It got trough with other changes. I now stand corrected
about the version matter and now the version/name of the source.tar
reflects the tag in gitorious.
I hope that this does not cause any more trouble.
--
Sami Sirkiä
On 01/17/2011 05:45 PM, [email protected] wrote:
Also, why is the version lower??
Trunk has pulseaudio-modules-meego 1.0, now we have 0.9.19.0.11.
Regards,
Madhu
-----Original Message-----
From: [email protected]
[mailto:[email protected]] On Behalf Of ext Anas Nashif
Sent: Monday, January 17, 2011 5:30 PM
To: Vivian Zhang
Cc: [email protected] list); [email protected]
Subject: Re: [meego-packaging] [meego-commits] 12131: Changes to
Trunk:Testing/pulseaudio-modules-meego
who is the owner of that package?
If it is you, please submit request..
Anas
On 17 Jan 2011, at 15:08, Vivian Zhang wrote:
Hi,
I have made the following changes to pulseaudio-modules-meego in project
Trunk:Testing. Please review and accept ASAP.
Thank You,
Vivian Zhang
[This message was auto-generated]
---
Request #12131:
submit: devel:multimedia/pulseaudio-modules-meego(r2) ->
Trunk:Testing/pulseaudio-modules-meego
Message:
No new features and bug fixings, just the improvement for the packaing,
including using yaml and use 0.9.19.0.11 style versioning
State: new 2011-01-17T07:08:25 vivian
Comment: None
changes files:
--------------
--- pulseaudio-modules-meego.changes
+++ pulseaudio-modules-meego.changes
@@ -0,0 +1,5 @@
+* Wed Jan 12 2011 Sami Sirkia<[email protected]> - 0.9.19.0.11
+- Went back to the 0.9.19.0.11 style versioning. It was a bad idea.
+- Source.tar is from git tag 0.9.19.0-11_released. No diff to previous.
+- Package now yamlified.
+
old:
----
maemo-multimedia-pulseaudio-modules-meego-master-20100915.tar.gz
new:
----
maemo-multimedia-pulseaudio-modules-meego-0.9.19.0-11_released.tar.gz
pulseaudio-modules-meego.yaml
spec files:
-----------
--- pulseaudio-modules-meego.spec
+++ pulseaudio-modules-meego.spec
@@ -1,114 +1,123 @@
+#
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.22git
+#
+#>> macros
+#<< macros
+%define keepstatic 1
+
Name: pulseaudio-modules-meego
-Version: 1.0
+Summary: Pulseaudio-modules for Meego handset
+Version: 0.9.19.0.11
Release: 0
-Summary: MeeGo pulseaudio-modules for N900
+Group: Multimedia/Pulseaudio
License: LGPLv2.1+
-Source0: maemo-multimedia-pulseaudio-modules-meego-master-20100915.tar.gz
+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-meego.yaml
Patch0: 0901-dont_build_main_volume.patch
Patch1: %{name}-include-call-state-tracker_h.patch
Patch2: %{name}-cmtspeech-ofono.patch
-URL:
http://meego.gitorious.org/maemo-multimedia/pulseaudio-modules-meego
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
BuildRequires: pkgconfig(check)
BuildRequires: pkgconfig(dbus-1)
+BuildRequires: pkgconfig(pulsecore)
BuildRequires: libcmtspeechdata-devel
BuildRequires: libtool-ltdl-devel
-BuildRequires: pkgconfig(pulsecore)
-BuildRequires: pkgconfig(libpulse)
-
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
%description
-MeeGo pulseaudio-modules
+pulseaudio-modules for MeeGo handset
+
%package devel
Summary: Development files for MeeGo pulseaudio-modules for N900
Group: Development/Libraries
Requires: %{name}-common = %{version}-%{release}
-Requires: %{name}-voice = %{version}-%{release}
-Requires: %{name}-cmtspeech = %{version}-%{release}
Requires: %{name}-music = %{version}-%{release}
Requires: %{name}-record = %{version}-%{release}
+Requires: %{name}-voice = %{version}-%{release}
+Requires: %{name}-cmtspeech = %{version}-%{release}
%description devel
This package contains development headers for MeeGo pulseaudio-modules
-%package common
-Summary: Common
+%package static
+Summary: Static development files for Meego pulseaudio-modules
Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+%description static
+This contains static development files for MeeGo pulseaudio-modules
+
+%package common
+Summary: Common libs for the MeeGo Pulseaudio modules
+Group: System/Libraries
%description common
This contains common libs for the MeeGo Pulseaudio modules.
-%package voice
-Summary: Voice module for pulseaudio
-Group: Development/Libraries
-Requires: %{name}-common = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description voice
-This contains voice module for MeeGo Pulseaudio
-
-%package cmtspeech
-Summary: Cmtspeech module for pulseaudio
-Group: Development/Libraries
-Requires: %{name}-common = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description cmtspeech
-This contains cmtspeech module for MeeGo Pulseaudio
-
%package music
Summary: Music module for pulseaudio
-Group: Development/Libraries
+Group: System/Libraries
Requires: %{name}-common = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
%description music
This contains music module for MeeGo Pulseaudio
%package record
Summary: Cmtspeech module for pulseaudio
-Group: Development/Libraries
+Group: System/Libraries
Requires: %{name}-common = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
%description record
This contains record module for MeeGo Pulseaudio
-%package static
-Summary: Static development files for Meego pulseaudio-modules
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
+%package voice
+Summary: Voice module for pulseaudio
+Group: System/Libraries
+Requires: %{name}-common = %{version}-%{release}
+
+%description voice
+This contains voice module for MeeGo Pulseaudio
+
+%package cmtspeech
+Summary: Cmtspeech module for pulseaudio
+Group: System/Libraries
+Requires: %{name}-common = %{version}-%{release}
+
+%description cmtspeech
+This contains cmtspeech module for MeeGo Pulseaudio with Nokia N900 modem
-%description static
-This contains static development files for MeeGo pulseaudio-modules
%prep
-%setup -q -n maemo-multimedia-pulseaudio-modules-meego
+%setup -q -n maemo-multimedia-%{name}
+
+# 0901-dont_build_main_volume.patch
%patch0 -p1
+# %{name}-include-call-state-tracker_h.patch
%patch1 -p1
+# %{name}-cmtspeech-ofono.patch
%patch2 -p1
+#>> setup
+#<< setup
%build
+#>> build pre
autoreconf -vfi
+#<< build pre
+
%configure
-V=1 make %{?jobs:-j%jobs}
+make %{?jobs:-j%jobs}
+#>> build post
+#<< build post
%install
-rm -rf $RPM_BUILD_ROOT
-%make_install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+#>> install pre
+#<< install pre
+%make_install
+#>> install post
install -d
%{buildroot}/usr/include/pulse-modules-headers/modules/meego/
install -m 644 src/common/algorithm-hook.h
%{buildroot}/usr/include/pulse-modules-headers/modules/meego/
install -m 644 src/common/memory.h
%{buildroot}/usr/include/pulse-modules-headers/modules/meego/
@@ -121,50 +130,123 @@
install -m 644 src/voice/module-voice-api.h
%{buildroot}/usr/include/pulse-modules-headers/modules/meego/
install -m 644 src/music/module-music-api.h
%{buildroot}/usr/include/pulse-modules-headers/modules/meego/
install -m 644 src/record/module-record-api.h
%{buildroot}/usr/include/pulse-modules-headers/modules/meego/
-install -m 644 src/common/.libs/libmeego-common.a
%{buildroot}/usr/lib/pulse-0.9.19/modules/
install -m 644 src/common/.libs/libmeego-common.la
%{buildroot}/usr/lib/pulse-0.9.19/modules/
+#<< install post
+
+
+
+
+
+
+
+
+
+
+
+
+
+%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
-%clean
-rm -rf $RPM_BUILD_ROOT
-%post common -p /sbin/ldconfig
-%postun common -p /sbin/ldconfig
-%post voice -p /sbin/ldconfig
-%postun voice -p /sbin/ldconfig
-%post cmtspeech -p /sbin/ldconfig
-%postun cmtspeech -p /sbin/ldconfig
-%post music -p /sbin/ldconfig
-%postun music -p /sbin/ldconfig
-%post record -p /sbin/ldconfig
-%postun record -p /sbin/ldconfig
%files devel
%defattr(-,root,root,-)
+#>> files devel
%{_includedir}/pulse-modules-headers/modules/meego/*
+#<< files devel
-%files common
-%defattr(-,root,root,-)
-%{_libdir}/pulse-0.9.19/modules/libmeego-common.so
-
-%files voice
+%files static
%defattr(-,root,root,-)
-%{_libdir}/pulse-0.9.19/modules/module-meego-voice.so
+#>> files static
+%{_libdir}/pulse-0.9.19/modules/libmeego-common.a
+%{_libdir}/pulse-0.9.19/modules/libmeego-common.la
+%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 static
-%files cmtspeech
+%files common
%defattr(-,root,root,-)
-%{_libdir}/pulse-0.9.19/modules/module-meego-cmtspeech.so
+#>> files common
+%{_libdir}/pulse-0.9.19/modules/libmeego-common.so
+#<< files common
%files music
%defattr(-,root,root,-)
+#>> files music
%{_libdir}/pulse-0.9.19/modules/module-meego-music.so
+#<< files music
%files record
%defattr(-,root,root,-)
+#>> files record
%{_libdir}/pulse-0.9.19/modules/module-meego-record.so
+#<< files record
-%files static
+%files voice
%defattr(-,root,root,-)
-%{_libdir}/pulse-0.9.19/modules/libmeego-common.a
-%{_libdir}/pulse-0.9.19/modules/libmeego-common.la
+#>> files voice
+%{_libdir}/pulse-0.9.19/modules/module-meego-voice.so
+#<< files voice
+
+%files cmtspeech
+%defattr(-,root,root,-)
+#>> files cmtspeech
+%{_libdir}/pulse-0.9.19/modules/module-meego-cmtspeech.so
+#<< files cmtspeech
-%exclude %{_libdir}/pulse-0.9.19/modules/module-meego-test.so
other changes:
--------------
++++++ maemo-multimedia-pulseaudio-modules-meego-0.9.19.0-11_released.tar.gz
(new)
++++++ pulseaudio-modules-meego.yaml (new)
--- pulseaudio-modules-meego.yaml
+++ pulseaudio-modules-meego.yaml
+Name: pulseaudio-modules-meego
+Summary: Pulseaudio-modules for Meego handset
+Version: 0.9.19.0.11
+Release: 0
+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:
+ - "0901-dont_build_main_volume.patch"
+ - "%{name}-include-call-state-tracker_h.patch"
+ - "%{name}-cmtspeech-ofono.patch"
+Description: pulseaudio-modules for MeeGo handset
+
+PkgBR:
+ - libcmtspeechdata-devel
+ - libtool-ltdl-devel
+PkgConfigBR:
+ - check
+ - dbus-1
+ - pulsecore
+Configure: configure
+Builder: make
+NoFiles: yes
+SubPackages:
+ - Name: devel
+ Summary: Development files for MeeGo pulseaudio-modules for N900
+ Group: Development/Libraries
+ 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: static
+ Summary: Static development files for Meego pulseaudio-modules
+ Group: Development/Libraries
+ Description: This contains static development files for MeeGo
pulseaudio-modules
+ Requires:
+ - "%{name}-devel = %{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.
+
+ - Name: music
+ Summary: Music module for pulseaudio
+ Group: System/Libraries
+ 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
+ Requires:
+ - "%{name}-common = %{version}-%{release}"
+
+ - Name: voice
+ Summary: Voice module for pulseaudio
+ Group: System/Libraries
+ 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
+ Requires:
+ - "%{name}-common = %{version}-%{release}"
+
++++++ deleted files:
--- maemo-multimedia-pulseaudio-modules-meego-master-20100915.tar.gz
_______________________________________________
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
_______________________________________________
MeeGo-packaging mailing list
[email protected]
http://lists.meego.com/listinfo/meego-packaging
_______________________________________________
MeeGo-packaging mailing list
[email protected]
http://lists.meego.com/listinfo/meego-packaging
