release: added packaging for gerrit.
authorJaska Uimonen <jaska.uimonen@intel.com>
Tue, 24 Jul 2012 11:33:20 +0000 (14:33 +0300)
committerJaska Uimonen <jaska.uimonen@intel.com>
Tue, 24 Jul 2012 11:33:20 +0000 (14:33 +0300)
14 files changed:
packaging/0001-build-sys-install-files-for-a-module-development.patch [new file with mode: 0644]
packaging/0002-jack-detection-fix-for-wired-headset.patch [new file with mode: 0644]
packaging/0003-packaging-added-spec.in-and-pulseaudio.service.patch [new file with mode: 0644]
packaging/0004-configuration-IVI-additions-to-default-config-files.patch [new file with mode: 0644]
packaging/0005-packaging-let-the-basic-package-pull-in-the-config.patch [new file with mode: 0644]
packaging/0006-scripts-added-OBS-exporter-script.patch [new file with mode: 0644]
packaging/0007-packaging-updated-build-dependencies-to-be-in-line-w.patch [new file with mode: 0644]
packaging/0008-packaging-put-systemd-service-units-under-_libdir.patch [new file with mode: 0644]
packaging/0009-packaging-module-devel-requires-version-exact-libs-d.patch [new file with mode: 0644]
packaging/0010-scripts-OBS-exporter-fix-do-read-without-escape-proc.patch [new file with mode: 0644]
packaging/0011-scripts-initial-release-implementation.patch [new file with mode: 0644]
packaging/0012-packaging-make-separate-package-for-module-augment-p.patch [new file with mode: 0644]
packaging/0013-release-added-no-verify-to-suppress-whitespace-error.patch [new file with mode: 0644]
packaging/pulseaudio.spec [new file with mode: 0644]

diff --git a/packaging/0001-build-sys-install-files-for-a-module-development.patch b/packaging/0001-build-sys-install-files-for-a-module-development.patch
new file mode 100644 (file)
index 0000000..3027545
--- /dev/null
@@ -0,0 +1,71 @@
+From 9cce2d667c34bad73dc4e829e7d660964afde0c7 Mon Sep 17 00:00:00 2001
+From: Jaska Uimonen <jaska.uimonen@helsinki.fi>
+Date: Tue, 5 Jun 2012 11:36:13 +0300
+Subject: [PATCH 01/13] build-sys: install files for a module development.
+
+---
+ Makefile.am                   |    8 +++++++-
+ configure.ac                  |    1 +
+ pulseaudio-module-devel.pc.in |   12 ++++++++++++
+ 3 files changed, 20 insertions(+), 1 deletions(-)
+ create mode 100644 pulseaudio-module-devel.pc.in
+
+diff --git a/Makefile.am b/Makefile.am
+index 8a94a7c..b03892e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -44,7 +44,10 @@ vapi_DATA = \
+               vala/libpulse-mainloop-glib.deps vala/libpulse-mainloop-glib.vapi
+ pkgconfigdir = $(libdir)/pkgconfig
+-pkgconfig_DATA = libpulse.pc libpulse-simple.pc
++pkgconfig_DATA = libpulse.pc libpulse-simple.pc pulseaudio-module-devel.pc
++
++moduledev_DATA = pulsecore-config.h src/pulsecore/*.h
++moduledevdir   = $(includedir)/pulsecore
+ if HAVE_GLIB20
+ pkgconfig_DATA += \
+@@ -82,6 +85,9 @@ dist-hook:
+       echo $(VERSION) > $(distdir)/.tarball-version
+       echo $(VERSION) > $(distdir)/.version
++pulsecore-config.h: config.h
++      cp $< $@
++
+ .PHONY: homepage distcleancheck doxygen
+ # see git-version-gen
+diff --git a/configure.ac b/configure.ac
+index 1936d7c..8ee5e33 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1333,6 +1333,7 @@ man/default.pa.5.xml
+ man/pulse-cli-syntax.5.xml
+ man/start-pulseaudio-kde.1.xml
+ man/start-pulseaudio-x11.1.xml
++pulseaudio-module-devel.pc
+ ])
+ AC_CONFIG_FILES([src/esdcompat:src/daemon/esdcompat.in], [chmod +x src/esdcompat])
+diff --git a/pulseaudio-module-devel.pc.in b/pulseaudio-module-devel.pc.in
+new file mode 100644
+index 0000000..16ba4ea
+--- /dev/null
++++ b/pulseaudio-module-devel.pc.in
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++modlibexecdir=@modlibexecdir@
++
++Name: pulseaudio-module-devel
++Description: PulseAudio Module Development Interface
++Version: @PACKAGE_VERSION@
++Libs: -L${libdir} -L${libdir}/pulseaudio -lpulsecommon-@PA_MAJORMINOR@ -lpulsecore-@PA_MAJORMINOR@
++Libs.private:
++Cflags: -I${includedir} -D_REENTRANT
+-- 
+1.7.7.6
+
diff --git a/packaging/0002-jack-detection-fix-for-wired-headset.patch b/packaging/0002-jack-detection-fix-for-wired-headset.patch
new file mode 100644 (file)
index 0000000..2d521b1
--- /dev/null
@@ -0,0 +1,34 @@
+From e09a893122daaf3102da1588f5e34e6720c5a1ce Mon Sep 17 00:00:00 2001
+From: Jaska Uimonen <jaska.uimonen@intel.com>
+Date: Sun, 10 Jun 2012 15:13:11 +0300
+Subject: [PATCH 02/13] jack detection fix for wired headset
+
+---
+ .../alsa/mixer/paths/analog-output-headphones.conf |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
+index 2860f28..2944932 100644
+--- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf
++++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
+@@ -22,7 +22,7 @@
+ priority = 90
+ name = analog-output-headphones
+-[Jack Headphone]
++[Jack Front Headphone]
+ required-any = any
+ [Element Hardware Master]
+@@ -68,7 +68,7 @@ volume = off
+ ; On some machines Front is actually a part of the Headphone path
+ [Element Front]
+-switch = mute
++switch = off
+ volume = zero
+ [Element Rear]
+-- 
+1.7.7.6
+
diff --git a/packaging/0003-packaging-added-spec.in-and-pulseaudio.service.patch b/packaging/0003-packaging-added-spec.in-and-pulseaudio.service.patch
new file mode 100644 (file)
index 0000000..3c144a0
--- /dev/null
@@ -0,0 +1,439 @@
+From 6cd35553d316012c11a8e77b6a6f463fac793c63 Mon Sep 17 00:00:00 2001
+From: Jaska Uimonen <jaska.uimonen@helsinki.fi>
+Date: Tue, 5 Jun 2012 16:03:40 +0300
+Subject: [PATCH 03/13] packaging: added spec.in and pulseaudio.service.
+
+---
+ pulseaudio.service |   10 ++
+ pulseaudio.spec.in |  402 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 412 insertions(+), 0 deletions(-)
+ create mode 100644 pulseaudio.service
+ create mode 100644 pulseaudio.spec.in
+
+diff --git a/pulseaudio.service b/pulseaudio.service
+new file mode 100644
+index 0000000..f9d8592
+--- /dev/null
++++ b/pulseaudio.service
+@@ -0,0 +1,10 @@
++[Unit]
++Description=pulseaudio service
++After=syslog.target dbus.service
++
++[Service]
++Type=simple
++ExecStart=/usr/bin/pulseaudio --system
++
++[Install]
++WantedBy=multi-user.target
+diff --git a/pulseaudio.spec.in b/pulseaudio.spec.in
+new file mode 100644
+index 0000000..85ad1dc
+--- /dev/null
++++ b/pulseaudio.spec.in
+@@ -0,0 +1,402 @@
++%define pulseversion 2.0
++
++Name:       pulseaudio
++Summary:    Improved Linux sound server
++Version:    @VERSION@
++Release:    0
++Group:      Multimedia/PulseAudio
++License:    LGPLv2+
++URL:        http://pulseaudio.org
++Source0:    http://127.0.0.1/pulseaudio-@VERSION@.tar.gz
++@DECLARE_PATCHES@
++Requires:   udev
++Requires(post): /sbin/ldconfig
++Requires(postun): /sbin/ldconfig
++BuildRequires:  pkgconfig(speexdsp)
++BuildRequires:  pkgconfig(sndfile)
++BuildRequires:  pkgconfig(alsa)
++BuildRequires:  pkgconfig(glib-2.0)
++BuildRequires:  pkgconfig(gconf-2.0)
++BuildRequires:  bluez-libs-devel
++#BuildRequires: pkgconfig(bluez)
++BuildRequires:  libdbus-devel
++BuildRequires:  pkgconfig(xi)
++BuildRequires:  pkgconfig(libudev)
++BuildRequires:  libatomic_ops-devel
++BuildRequires:  pkgconfig(openssl)
++BuildRequires:  json-c-devel
++BuildRequires:  m4
++BuildRequires:  libtool-ltdl-devel
++BuildRequires:  libtool
++BuildRequires:  intltool
++BuildRequires:  fdupes
++
++
++%description
++PulseAudio is a sound server for Linux and other Unix like operating
++systems. It is intended to be an improved drop-in replacement for the
++Enlightened Sound Daemon (ESOUND).
++
++%package libs
++Summary:    PulseAudio client libraries
++Group:      Multimedia/PulseAudio
++Requires:   %{name} = %{version}-%{release}
++
++%description libs
++Client libraries used by applications that access a PulseAudio sound server
++via PulseAudio's native interface.
++
++
++%package libs-devel
++Summary:    PulseAudio client development headers and libraries
++Group:      Development/Libraries
++Requires:   %{name} = %{version}-%{release}
++
++%description libs-devel
++Headers and libraries for developing applications that access a PulseAudio
++sound server via PulseAudio's native interface
++
++
++%package utils
++Summary:    Command line tools for the PulseAudio sound server
++Group:      Multimedia/PulseAudio
++Requires:   %{name} = %{version}-%{release}
++
++%description utils
++These tools provide command line access to various features of the
++PulseAudio sound server. Included tools are:
++pabrowse - Browse available PulseAudio servers on the local network.
++paplay - Playback a WAV file via a PulseAudio sink.
++pacat - Cat raw audio data to a PulseAudio sink.
++parec - Cat raw audio data from a PulseAudio source.
++pacmd - Connect to PulseAudio's built-in command line control interface.
++pactl - Send a control command to a PulseAudio server.
++padsp - /dev/dsp wrapper to transparently support OSS applications.
++pax11publish - Store/retrieve PulseAudio default server/sink/source
++settings in the X11 root window.
++
++
++%package module-bluetooth
++Summary:    Bluetooth module for PulseAudio sound server
++Group:      Multimedia/PulseAudio
++Requires:   %{name} = %{version}-%{release}
++
++%description module-bluetooth
++This module enables PulseAudio to work with bluetooth devices, like headset
++or audio gatewa
++
++%package module-devel
++Summary:        Headers and libraries for PulseAudio module development
++License:        LGPLv2+
++Group:          Development/Libraries
++
++%package config
++Summary: Default configuration for PulseAudio.
++Group: System Environment/Configuration
++
++%description config
++Default configuration for PulseAudio.
++
++%description module-devel
++Headers and libraries for developing pulseaudio modules
++
++#%package module-zeroconf
++#Summary: PA module-zeroconf
++#Group:   Multimedia/PulseAudio
++#
++#%description module-zeroconf
++#PA module-zeroconf.
++
++%package module-raop
++Summary: PA module-raop
++Group:   Multimedia/PulseAudio
++
++%description module-raop
++PA module-raop.
++
++%package module-filter
++Summary: PA module-filter
++Group:   Multimedia/PulseAudio
++
++%description module-filter
++PA module-filter.
++
++%package module-combine-sink
++Summary: PA module-combine-sink
++Group:   Multimedia/PulseAudio
++
++%description module-combine-sink
++PA module-combine-sink.
++
++%package module-dbus-protocol
++Summary: PA module-dbus-protocol
++Group:   Multimedia/PulseAudio
++
++%description module-dbus-protocol
++PA module-dbus-protocol.
++
++%package module-null-source
++Summary: PA module-null-source
++Group:   Multimedia/PulseAudio
++
++%description module-null-source
++PA module-null-source.
++
++%package module-switch-on-connect
++Summary: PA module-swich-on-connect
++Group:   Multimedia/PulseAudio
++
++%description module-switch-on-connect
++PA module-swich-on-connect.
++
++%package localization
++Summary:    PA localization files.
++Group:      Multimedia/PulseAudio
++Requires:   %{name} = %{version}-%{release}
++
++%description localization
++PA localization files.
++
++%package vala-bindings
++Summary:    PA Vala bindings.
++Group:      Multimedia/PulseAudio
++Requires:   %{name} = %{version}-%{release}
++
++%description vala-bindings
++PA Vala bindings.
++
++
++%prep
++%setup -q -n pulseaudio-2.0
++echo "%{version}" > .tarball-version
++@APPLY_PATCHES@
++./bootstrap.sh
++
++%build
++CPUS="`cat /proc/cpuinfo  | grep ^processor | wc -l`"
++JOBS="-j$(($CPUS + 1))"
++
++unset LD_AS_NEEDED
++export LDFLAGS+="-Wl,--no-as-needed"
++%configure --disable-static --enable-alsa --disable-ipv6 --disable-oss-output --disable-oss-wrapper --enable-bluez --disable-x11 --disable-hal --disable-hal-compat --disable-lirc --disable-avahi --disable-jack --without-fftw --disable-xen
++make $JOBS
++
++%install
++rm -rf %{buildroot}
++%make_install
++
++install -d  %{buildroot}/%{_lib}/systemd/system
++install -m 644 pulseaudio.service %{buildroot}/%{_lib}/systemd/system/pulseaudio.service
++mkdir -p  %{buildroot}/%{_lib}/systemd/system/multi-user.target.wants
++ln -s  ../pulseaudio.service  %{buildroot}/%{_lib}/systemd/system/multi-user.target.wants/pulseaudio.service
++
++rm -rf  %{buildroot}/etc/xdg/autostart/pulseaudio-kde.desktop
++rm -rf  %{buildroot}/usr/bin/start-pulseaudio-kde
++rm -rf %{buildroot}/%{_libdir}/pulse-%{pulseversion}/modules/module-device-manager.so
++
++%find_lang pulseaudio
++fdupes  %{buildroot}/%{_datadir}
++fdupes  %{buildroot}/%{_includedir}
++
++# get rid of *.la files
++rm -f %{buildroot}/%{_libdir}/*.la
++rm -f %{buildroot}/%{_libdir}/pulseaudio/*.la
++
++# put the default configuration file in place
++install -m 644 src/default.pa %{buildroot}/%{_sysconfdir}/pulse
++
++
++%post
++/sbin/ldconfig
++
++%postun
++/sbin/ldconfig
++
++%post libs -p /sbin/ldconfig
++
++%postun libs -p /sbin/ldconfig
++
++
++%post module-bluetooth -p /sbin/ldconfig
++%postun module-bluetooth -p /sbin/ldconfig
++
++
++%docs_package
++
++%lang_package
++
++
++%files
++%defattr(-,root,root,-)
++%doc LICENSE GPL LGPL
++%dir %{_sysconfdir}/pulse/
++%{_bindir}/esdcompat
++%{_bindir}/pulseaudio
++%dir %{_libexecdir}/pulse
++%{_libexecdir}/pulse/*
++%{_libdir}/libpulsecore-%{pulseversion}.so
++%{_libdir}/libpulse-mainloop-glib.so.*
++/lib/udev/rules.d/90-pulseaudio.rules
++%{_datadir}/pulseaudio/alsa-mixer/paths/*
++%{_datadir}/pulseaudio/alsa-mixer/profile-sets/*
++%{_bindir}/pamon
++/etc/dbus-1/system.d/pulseaudio-system.conf
++# cmake stuff
++%{_libdir}/cmake/PulseAudio/PulseAudioConfig.cmake
++%{_libdir}/cmake/PulseAudio/PulseAudioConfigVersion.cmake
++# list all modules
++%{_libdir}/pulse-%{pulseversion}/modules/libalsa-util.so
++%{_libdir}/pulse-%{pulseversion}/modules/libcli.so
++%{_libdir}/pulse-%{pulseversion}/modules/libprotocol-cli.so
++%{_libdir}/pulse-%{pulseversion}/modules/libprotocol-http.so
++%{_libdir}/pulse-%{pulseversion}/modules/libprotocol-native.so
++%{_libdir}/pulse-%{pulseversion}/modules/libprotocol-simple.so
++%{_libdir}/pulse-%{pulseversion}/modules/librtp.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-alsa-sink.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-alsa-source.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-always-sink.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-console-kit.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-device-restore.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-stream-restore.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-cli-protocol-tcp.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-cli-protocol-unix.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-cli.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-combine.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-default-device-restore.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-detect.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-esound-sink.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-http-protocol-tcp.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-http-protocol-unix.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-intended-roles.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-ladspa-sink.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-match.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-mmkbd-evdev.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-native-protocol-fd.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-native-protocol-tcp.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-native-protocol-unix.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-null-sink.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-pipe-sink.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-pipe-source.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-position-event-sounds.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-remap-sink.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-rescue-streams.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-rtp-recv.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-rtp-send.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-simple-protocol-tcp.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-simple-protocol-unix.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-sine.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-tunnel-sink.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-tunnel-source.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-suspend-on-idle.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-volume-restore.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-alsa-card.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-augment-properties.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-card-restore.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-sine-source.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-loopback.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-rygel-media-server.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-echo-cancel.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-virtual-sink.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-virtual-source.so
++%{_libdir}/pulse-%{pulseversion}/modules/libprotocol-esound.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-esound-compat-spawnfd.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-esound-compat-spawnpid.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-esound-protocol-tcp.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-esound-protocol-unix.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-gconf.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-udev-detect.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-role-cork.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-switch-on-port-available.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-virtual-surround-sink.so
++/%{_lib}/systemd/system/pulseaudio.service
++/%{_lib}/systemd/system/multi-user.target.wants/pulseaudio.service
++
++%files libs
++%defattr(-,root,root,-)
++%{_libdir}/libpulse.so.*
++%{_libdir}/libpulse-simple.so.*
++%{_libdir}/pulseaudio/libpulsecommon-*.so
++
++%files libs-devel
++%defattr(-,root,root,-)
++%{_includedir}/pulse/*
++%{_libdir}/libpulse.so
++%{_libdir}/libpulse-simple.so
++%{_libdir}/pkgconfig/libpulse-simple.pc
++%{_libdir}/pkgconfig/libpulse.pc
++%{_datadir}/vala/vapi/libpulse.vapi
++%{_libdir}/pkgconfig/libpulse-mainloop-glib.pc
++%{_libdir}/libpulse-mainloop-glib.so
++
++%files utils
++%defattr(-,root,root,-)
++%doc %{_mandir}/man1/*
++%doc %{_mandir}/man5/*
++%{_bindir}/pacat
++%{_bindir}/pacmd
++%{_bindir}/pactl
++%{_bindir}/paplay
++%{_bindir}/parec
++%{_bindir}/pamon
++%{_bindir}/parecord
++%{_bindir}/pasuspender
++
++%files module-bluetooth
++%defattr(-,root,root,-)
++%{_libdir}/pulse-%{pulseversion}/modules/module-bluetooth-proximity.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-bluetooth-device.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-bluetooth-discover.so
++%{_libdir}/pulse-%{pulseversion}/modules/libbluetooth-ipc.so
++%{_libdir}/pulse-%{pulseversion}/modules/libbluetooth-sbc.so
++%{_libdir}/pulse-%{pulseversion}/modules/libbluetooth-util.so
++
++#%files module-zeroconf
++#%defattr(-,root,root,-)
++#%{_libdir}/pulse-%{pulseversion}/modules/libavahi-wrap.so
++#%{_libdir}/pulse-%{pulseversion}/modules/module-zeroconf*.so
++
++%files module-raop
++%defattr(-,root,root,-)
++%{_libdir}/pulse-%{pulseversion}/modules/libraop.so
++%{_libdir}/pulse-%{pulseversion}/modules/module-raop*.so
++
++%files module-filter
++%defattr(-,root,root,-)
++%{_libdir}/pulse-%{pulseversion}/modules/module-filter-*.so
++
++%files module-combine-sink
++%defattr(-,root,root,-)
++%{_libdir}/pulse-%{pulseversion}/modules/module-combine-sink.so
++
++%files module-dbus-protocol
++%defattr(-,root,root,-)
++%{_libdir}/pulse-%{pulseversion}/modules/module-dbus-protocol.so
++
++%files module-null-source
++%defattr(-,root,root,-)
++%{_libdir}/pulse-%{pulseversion}/modules/module-null-source.so
++
++%files module-switch-on-connect
++%defattr(-,root,root,-)
++%{_libdir}/pulse-%{pulseversion}/modules/module-switch-on-connect.so
++
++%files config
++%defattr(-,root,root,-)
++%{_sysconfdir}/pulse/default.pa
++%{_sysconfdir}/pulse/client.conf
++%{_sysconfdir}/pulse/default.pa
++%{_sysconfdir}/pulse/system.pa
++%{_sysconfdir}/pulse/daemon.conf
++
++%files module-devel
++%defattr(-,root,root)
++%{_includedir}/pulsecore
++%{_libdir}/pkgconfig/pulseaudio-module-devel.pc
++
++%files localization
++%defattr(-,root,root,-)
++%{_datadir}/locale/*/LC_MESSAGES/pulseaudio.mo
++
++%files vala-bindings
++%defattr(-,root,root,-)
++%{_datadir}/vala/vapi/*
+-- 
+1.7.7.6
+
diff --git a/packaging/0004-configuration-IVI-additions-to-default-config-files.patch b/packaging/0004-configuration-IVI-additions-to-default-config-files.patch
new file mode 100644 (file)
index 0000000..8ee8646
--- /dev/null
@@ -0,0 +1,106 @@
+From 29fee4347f1354a5f6f5246315939d057038473d Mon Sep 17 00:00:00 2001
+From: Jaska Uimonen <jaska.uimonen@helsinki.fi>
+Date: Tue, 5 Jun 2012 17:22:35 +0300
+Subject: [PATCH 04/13] configuration: IVI additions to default config files.
+
+---
+ src/daemon/default.pa.in |   21 +++++++++++++--------
+ src/daemon/system.pa.in  |   19 ++++++++++++++++---
+ 2 files changed, 29 insertions(+), 11 deletions(-)
+
+diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
+index 88b5944..df22202 100755
+--- a/src/daemon/default.pa.in
++++ b/src/daemon/default.pa.in
+@@ -35,10 +35,10 @@ load-sample-dir-lazy %WINDIR%\Media\*.wav
+ .fail
+-### Automatically restore the volume of streams and devices
+-load-module module-device-restore
+-load-module module-stream-restore
+-load-module module-card-restore
++### Do not automatically restore the volume of streams and devices
++#load-module module-device-restore
++#load-module module-stream-restore
++#load-module module-card-restore
+ ### Automatically augment property information from .desktop files
+ ### stored in /usr/share/application
+@@ -139,8 +139,8 @@ load-module module-rescue-streams
+ ### Make sure we always have a sink around, even if it is a null sink.
+ load-module module-always-sink
+-### Honour intended role device property
+-load-module module-intended-roles
++### Do not honour intended role device property
++#load-module module-intended-roles
+ ### Automatically suspend sinks/sources that become idle for too long
+ load-module module-suspend-on-idle
+@@ -157,8 +157,8 @@ load-module module-systemd-login
+ ### Enable positioned event sounds
+ load-module module-position-event-sounds
+-### Cork music/video streams when a phone stream is active
+-load-module module-role-cork
++### Do not cork music/video streams when a phone stream is active
++#load-module module-role-cork
+ ### Modules to allow autoloading of filters (such as echo cancellation)
+ ### on demand. module-filter-heuristics tries to determine what filters
+@@ -193,6 +193,11 @@ ifelse(@HAVE_X11@, 1, [dnl
+ #.endif
+ ])dnl
++### Load the Murphy IVI module if it exists
++.ifexists module-murphy-ivi@PA_SOEXT@
++load-module module-murphy-ivi dbus_bus_type=system
++.endif
++
+ load-module module-switch-on-port-available
+ ### Make some devices default
+diff --git a/src/daemon/system.pa.in b/src/daemon/system.pa.in
+index e881a12..d9de687 100755
+--- a/src/daemon/system.pa.in
++++ b/src/daemon/system.pa.in
+@@ -36,15 +36,23 @@ load-module module-hal-detect
+ load-module module-detect
+ .endif
++ifelse(@HAVE_BLUEZ@, 1, [dnl
++### Automatically load driver modules for Bluetooth hardware
++.ifexists module-bluetooth-discover@PA_SOEXT@
++load-module module-bluetooth-discover
++.endif
++])dnl
++
++
+ ### Load several protocols
+ .ifexists module-esound-protocol-unix@PA_SOEXT@
+ load-module module-esound-protocol-unix
+ .endif
+ load-module module-native-protocol-unix
+-### Automatically restore the volume of streams and devices
+-load-module module-stream-restore
+-load-module module-device-restore
++### Do not automatically restore the volume of streams and devices
++#load-module module-stream-restore
++#load-module module-device-restore
+ ### Automatically restore the default sink/source when changed by the user
+ ### during runtime
+@@ -69,3 +77,8 @@ load-module module-suspend-on-idle
+ ### Enable positioned event sounds
+ load-module module-position-event-sounds
++
++### Load the Murphy IVI module if it exists
++.ifexists module-murphy-ivi@PA_SOEXT@
++load-module module-murphy-ivi dbus_bus_type=system
++.endif
+-- 
+1.7.7.6
+
diff --git a/packaging/0005-packaging-let-the-basic-package-pull-in-the-config.patch b/packaging/0005-packaging-let-the-basic-package-pull-in-the-config.patch
new file mode 100644 (file)
index 0000000..049f1c7
--- /dev/null
@@ -0,0 +1,24 @@
+From 01a168fe54e180f90d5c626291a3e0dc9d436c6d Mon Sep 17 00:00:00 2001
+From: Jaska Uimonen <jaska.uimonen@helsinki.fi>
+Date: Tue, 5 Jun 2012 17:31:34 +0300
+Subject: [PATCH 05/13] packaging: let the basic package pull in the config.
+
+---
+ pulseaudio.spec.in |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/pulseaudio.spec.in b/pulseaudio.spec.in
+index 85ad1dc..245c9a4 100644
+--- a/pulseaudio.spec.in
++++ b/pulseaudio.spec.in
+@@ -12,6 +12,7 @@ Source0:    http://127.0.0.1/pulseaudio-@VERSION@.tar.gz
+ Requires:   udev
+ Requires(post): /sbin/ldconfig
+ Requires(postun): /sbin/ldconfig
++Requires: pulseaudio-config
+ BuildRequires:  pkgconfig(speexdsp)
+ BuildRequires:  pkgconfig(sndfile)
+ BuildRequires:  pkgconfig(alsa)
+-- 
+1.7.7.6
+
diff --git a/packaging/0006-scripts-added-OBS-exporter-script.patch b/packaging/0006-scripts-added-OBS-exporter-script.patch
new file mode 100644 (file)
index 0000000..f92ebfd
--- /dev/null
@@ -0,0 +1,156 @@
+From 5942e2586df41224b40946b4a624903b7cd931b3 Mon Sep 17 00:00:00 2001
+From: Jaska Uimonen <jaska.uimonen@helsinki.fi>
+Date: Tue, 5 Jun 2012 17:50:47 +0300
+Subject: [PATCH 06/13] scripts: added OBS exporter script.
+
+---
+ obs-export.sh |  137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 137 insertions(+), 0 deletions(-)
+ create mode 100755 obs-export.sh
+
+diff --git a/obs-export.sh b/obs-export.sh
+new file mode 100755
+index 0000000..36cfc45
+--- /dev/null
++++ b/obs-export.sh
+@@ -0,0 +1,137 @@
++#!/bin/bash
++
++# This needs a bit more work, mostly on the "discplined engineering" front.
++# IOW, instead of this UPSTREAM_BASE hack it would be better to have 3
++# branches:
++#   1) pristine upstream: for tracking upstream progress/retrogression
++#   2) patched upstream: pristine upstream with outr patches applied
++#   3) working local: patches upstream + a set of scripts (like this) to
++#      do everyday stuff like making new releases, exporting stuff to
++#      OBS, etc...
++
++
++PKG="$(basename `pwd`)"
++UPSTREAM_BASE="upstream"
++VERSION="`date +'%Y%m%d'`"
++HEAD="HEAD"
++MODE=gerrit
++
++while [ "${1#-}" != "$1" -a -n "$1" ]; do
++    case $1 in
++        --name|-n)
++            PKG="$2"
++            shift 2
++            ;;
++        --version|-v)
++            VERSION="$2"
++            shift 2
++          ;;
++        --base|-B|-b)
++            UPSTREAM_BASE="$2"
++            shift 2
++            ;;
++        --head|-H)
++            HEAD="$2"
++            shift 2
++          ;;
++        --obs|-o)
++            MODE="obs"
++            shift 1
++          ;;
++        --help|-h)
++           echo "usage: $0 [options], where the possible options are"
++           echo "  -n <name>           name of your package"
++           echo "  -v <version>        version to in rpm/SPEC file"
++           echo "  -B <upstream-base>  name or SHA1 of baseline"
++           echo "  -H <taget-head>     name or SHA1 of release HEAD"
++           echo "  --obs               include tarball for OBS"
++           echo ""
++           echo "<name> is the name of the package, <version> is the version"
++           echo "you want to export to OBS, and <upstream-base> is the name of"
++           echo "the upstream git branch or the SHA1 you want to generate your"
++           echo "release from and base your patches on top of. On OBS mode the"
++           echo "output will be generated in a directory called obs-$VERSION."
++           echo "Otherwise in gerrit mode, the output will be generated in a"
++           echo "directory called packaging."
++         echo ""
++           echo "E.g.:"
++           echo "  $0 -n pulseaudio -v 2.0 -B pulseaudio-2.0 -H tizen"
++           echo ""
++           echo "This will produce a gerrit export with version 2.0 against the"
++           echo "SHA1 pulseaudio-2.0, producing patches up till tizen and"
++           echo "place the result in a directory called packaging."
++           exit 0
++           ;;
++        --debug|-d)
++           set -x
++           ;;
++        *) echo "usage: $0 [-n <name>][-v <version>][--obs]"
++           echo "          [-b <upstream-base>] [-H <head>"
++           exit 1
++           ;;
++    esac
++done
++
++case $MODE in
++    gerrit)
++        TARBALL=""
++        DIR=packaging
++        ;;
++    obs)
++        TARBALL=$PKG-$VERSION.tar
++        DIR="obs-$VERSION"
++        ;;
++    *)
++        echo "invalid mode: $MODE"
++        exit 1
++        ;;
++esac
++
++echo "Package name: $PKG"
++echo "Package version: $VERSION"
++echo "Package baseline: $UPSTREAM_BASE"
++echo "Package head: $HEAD"
++echo "Output directory: $DIR"
++
++rm -fr $DIR
++mkdir $DIR
++
++if [ -n "$TARBALL" ]; then
++    echo "Generating tarball..."
++        git archive --format=tar --prefix=$PKG-$VERSION/ $UPSTREAM_BASE \
++            > $DIR/$TARBALL && \
++        gzip $DIR/$TARBALL
++fi
++
++echo "Generating patches, creating spec file..."
++cd $DIR && \
++    git format-patch -n $UPSTREAM_BASE..$HEAD && \
++    cat ../$PKG.spec.in | sed "s/@VERSION@/$VERSION/g" > $PKG.spec.in && \
++cd - >& /dev/null
++
++cd $DIR
++patchlist="`ls *.patch`"
++cat $PKG.spec.in | while read line; do
++    case $line in
++        @DECLARE_PATCHES@)
++            i=0
++            for patch in $patchlist; do
++                echo "Patch$i: $patch"
++                let i=$i+1
++            done
++            ;;
++        @APPLY_PATCHES@)
++            i=0
++            for patch in $patchlist; do
++                echo "%patch$i -p1"
++                let i=$i+1
++            done
++            ;;
++        *)
++            echo "$line"
++            ;;
++    esac
++done > $PKG.spec
++cd - >& /dev/null
++
++rm -f $DIR/$PKG.spec.in
+-- 
+1.7.7.6
+
diff --git a/packaging/0007-packaging-updated-build-dependencies-to-be-in-line-w.patch b/packaging/0007-packaging-updated-build-dependencies-to-be-in-line-w.patch
new file mode 100644 (file)
index 0000000..d13db3c
--- /dev/null
@@ -0,0 +1,29 @@
+From e2aa1043c1a88410a1729afa8ff234df0617834f Mon Sep 17 00:00:00 2001
+From: Krisztian Litkey <krisztian.litkey@intel.com>
+Date: Thu, 5 Jul 2012 20:22:53 +0300
+Subject: [PATCH 07/13] packaging: updated build dependencies to be in line
+ with the latest repos.
+
+---
+ pulseaudio.spec.in |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/pulseaudio.spec.in b/pulseaudio.spec.in
+index 245c9a4..e7d6167 100644
+--- a/pulseaudio.spec.in
++++ b/pulseaudio.spec.in
+@@ -18,9 +18,8 @@ BuildRequires:  pkgconfig(sndfile)
+ BuildRequires:  pkgconfig(alsa)
+ BuildRequires:  pkgconfig(glib-2.0)
+ BuildRequires:  pkgconfig(gconf-2.0)
+-BuildRequires:  bluez-libs-devel
+-#BuildRequires: pkgconfig(bluez)
+-BuildRequires:  libdbus-devel
++BuildRequires:  pkgconfig(bluez)
++BuildRequires:  pkgconfig(dbus-1)
+ BuildRequires:  pkgconfig(xi)
+ BuildRequires:  pkgconfig(libudev)
+ BuildRequires:  libatomic_ops-devel
+-- 
+1.7.7.6
+
diff --git a/packaging/0008-packaging-put-systemd-service-units-under-_libdir.patch b/packaging/0008-packaging-put-systemd-service-units-under-_libdir.patch
new file mode 100644 (file)
index 0000000..b174467
--- /dev/null
@@ -0,0 +1,42 @@
+From 58e298d9c2eb91bd3b17ae76911f4e5f3641c02d Mon Sep 17 00:00:00 2001
+From: Krisztian Litkey <krisztian.litkey@intel.com>
+Date: Thu, 5 Jul 2012 20:26:56 +0300
+Subject: [PATCH 08/13] packaging: put systemd service units under %{_libdir}.
+
+---
+ pulseaudio.spec.in |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/pulseaudio.spec.in b/pulseaudio.spec.in
+index e7d6167..ad879aa 100644
+--- a/pulseaudio.spec.in
++++ b/pulseaudio.spec.in
+@@ -185,10 +185,10 @@ make $JOBS
+ rm -rf %{buildroot}
+ %make_install
+-install -d  %{buildroot}/%{_lib}/systemd/system
+-install -m 644 pulseaudio.service %{buildroot}/%{_lib}/systemd/system/pulseaudio.service
+-mkdir -p  %{buildroot}/%{_lib}/systemd/system/multi-user.target.wants
+-ln -s  ../pulseaudio.service  %{buildroot}/%{_lib}/systemd/system/multi-user.target.wants/pulseaudio.service
++install -d  %{buildroot}/%{_libdir}/systemd/system
++install -m 644 pulseaudio.service %{buildroot}/%{_libdir}/systemd/system/pulseaudio.service
++mkdir -p  %{buildroot}/%{_libdir}/systemd/system/multi-user.target.wants
++ln -s  ../pulseaudio.service  %{buildroot}/%{_libdir}/systemd/system/multi-user.target.wants/pulseaudio.service
+ rm -rf  %{buildroot}/etc/xdg/autostart/pulseaudio-kde.desktop
+ rm -rf  %{buildroot}/usr/bin/start-pulseaudio-kde
+@@ -308,8 +308,8 @@ install -m 644 src/default.pa %{buildroot}/%{_sysconfdir}/pulse
+ %{_libdir}/pulse-%{pulseversion}/modules/module-role-cork.so
+ %{_libdir}/pulse-%{pulseversion}/modules/module-switch-on-port-available.so
+ %{_libdir}/pulse-%{pulseversion}/modules/module-virtual-surround-sink.so
+-/%{_lib}/systemd/system/pulseaudio.service
+-/%{_lib}/systemd/system/multi-user.target.wants/pulseaudio.service
++%{_libdir}/systemd/system/pulseaudio.service
++%{_libdir}/systemd/system/multi-user.target.wants/pulseaudio.service
+ %files libs
+ %defattr(-,root,root,-)
+-- 
+1.7.7.6
+
diff --git a/packaging/0009-packaging-module-devel-requires-version-exact-libs-d.patch b/packaging/0009-packaging-module-devel-requires-version-exact-libs-d.patch
new file mode 100644 (file)
index 0000000..21630cd
--- /dev/null
@@ -0,0 +1,25 @@
+From 1dfdeca28d45d178b09954e80b7c32571ab7103d Mon Sep 17 00:00:00 2001
+From: Krisztian Litkey <krisztian.litkey@intel.com>
+Date: Thu, 5 Jul 2012 20:35:28 +0300
+Subject: [PATCH 09/13] packaging: module-devel requires version-exact
+ libs-devel.
+
+---
+ pulseaudio.spec.in |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/pulseaudio.spec.in b/pulseaudio.spec.in
+index ad879aa..bc81a7c 100644
+--- a/pulseaudio.spec.in
++++ b/pulseaudio.spec.in
+@@ -89,6 +89,7 @@ or audio gatewa
+ Summary:        Headers and libraries for PulseAudio module development
+ License:        LGPLv2+
+ Group:          Development/Libraries
++Requires:       %{name}-libs-devel = %{version}-%{release}
+ %package config
+ Summary: Default configuration for PulseAudio.
+-- 
+1.7.7.6
+
diff --git a/packaging/0010-scripts-OBS-exporter-fix-do-read-without-escape-proc.patch b/packaging/0010-scripts-OBS-exporter-fix-do-read-without-escape-proc.patch
new file mode 100644 (file)
index 0000000..400b157
--- /dev/null
@@ -0,0 +1,26 @@
+From 257c7b51a2113c1c84c20611317382dbc6fa0c47 Mon Sep 17 00:00:00 2001
+From: Krisztian Litkey <krisztian.litkey@intel.com>
+Date: Fri, 6 Jul 2012 11:11:36 +0300
+Subject: [PATCH 10/13] scripts: OBS exporter fix (do read without escape
+ processing).
+
+---
+ obs-export.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/obs-export.sh b/obs-export.sh
+index 36cfc45..75df10a 100755
+--- a/obs-export.sh
++++ b/obs-export.sh
+@@ -111,7 +111,7 @@ cd - >& /dev/null
+ cd $DIR
+ patchlist="`ls *.patch`"
+-cat $PKG.spec.in | while read line; do
++cat $PKG.spec.in | while read -r line; do
+     case $line in
+         @DECLARE_PATCHES@)
+             i=0
+-- 
+1.7.7.6
+
diff --git a/packaging/0011-scripts-initial-release-implementation.patch b/packaging/0011-scripts-initial-release-implementation.patch
new file mode 100644 (file)
index 0000000..c20c359
--- /dev/null
@@ -0,0 +1,79 @@
+From 1afd282499bea3d6f1898e1a4afc45184cda25de Mon Sep 17 00:00:00 2001
+From: Krisztian Litkey <krisztian.litkey@intel.com>
+Date: Fri, 6 Jul 2012 13:41:21 +0300
+Subject: [PATCH 11/13] scripts: initial --release implementation.
+
+---
+ obs-export.sh |   45 +++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 45 insertions(+), 0 deletions(-)
+
+diff --git a/obs-export.sh b/obs-export.sh
+index 75df10a..43c66d6 100755
+--- a/obs-export.sh
++++ b/obs-export.sh
+@@ -15,6 +15,8 @@ UPSTREAM_BASE="upstream"
+ VERSION="`date +'%Y%m%d'`"
+ HEAD="HEAD"
+ MODE=gerrit
++RELEASE=no
++AUTHOR="Policy Team <policy.team@intel.com>"
+ while [ "${1#-}" != "$1" -a -n "$1" ]; do
+     case $1 in
+@@ -65,6 +67,14 @@ while [ "${1#-}" != "$1" -a -n "$1" ]; do
+         --debug|-d)
+            set -x
+            ;;
++        --big-hammer|--release|-r)
++           RELEASE=yes
++           shift 1
++           ;;
++        --author|-a)
++           AUTHOR="$2"
++           shift 2
++           ;;
+         *) echo "usage: $0 [-n <name>][-v <version>][--obs]"
+            echo "          [-b <upstream-base>] [-H <head>"
+            exit 1
+@@ -135,3 +145,38 @@ done > $PKG.spec
+ cd - >& /dev/null
+ rm -f $DIR/$PKG.spec.in
++
++if [ "$MODE" = "gerrit" -a "$RELEASE" = "yes" ]; then
++    stamp="$(date -u +%F.%H%M%S)"
++    branch="gerrit-release-$stamp"
++    tag="build/$stamp"
++    chlog=packaging/$PKG.changes
++
++    echo "Preparing release branch $branch with tag $tag..."
++
++    git branch $branch $UPSTREAM_BASE && \
++        git checkout $branch && \
++        git add packaging && \
++        git commit -m "release: added packaging for gerrit." packaging && \
++        echo "* $(date '+%a %b %d %H:%M:%S %Z %Y') $AUTHOR - $VERSION" \
++            > $chlog && \
++        echo "- release: releasing $VERSION..." >> $chlog && \
++            git add $chlog &&
++        echo "" && \
++        echo "Okay, branch $branch is prepared for release." && \
++        echo "To proceed with the release, please" && \
++        echo "" && \
++        echo "  1) vi $chlog (and add a real changelog entry)" && \
++        echo "  2) git commit -m \"release: updated changelog.\" $chlog" && \
++        echo "  3) git tag -a -m \"release: tagged release.\" $tag HEAD" && \
++        echo "  4) git push --force tzgerrit HEAD^:refs/heads/master" && \
++        echo "  5) git push tzgerrit HEAD:refs/for/master $tag"
++
++    if [ "$?" = "0" ]; then
++        echo "Done."
++    else
++        echo "Failed to prepare release..."
++        git branch -D $branch
++        exit 1
++    fi
++fi
+-- 
+1.7.7.6
+
diff --git a/packaging/0012-packaging-make-separate-package-for-module-augment-p.patch b/packaging/0012-packaging-make-separate-package-for-module-augment-p.patch
new file mode 100644 (file)
index 0000000..a44115d
--- /dev/null
@@ -0,0 +1,50 @@
+From f25eaeec55ade5eb71403d100f005f826f5aa52a Mon Sep 17 00:00:00 2001
+From: Jaska Uimonen <jaska.uimonen@intel.com>
+Date: Tue, 24 Jul 2012 13:41:56 +0300
+Subject: [PATCH 12/13] packaging: make separate package for
+ module-augment-properties
+
+---
+ pulseaudio.spec.in |   12 +++++++++++-
+ 1 files changed, 11 insertions(+), 1 deletions(-)
+
+diff --git a/pulseaudio.spec.in b/pulseaudio.spec.in
+index bc81a7c..84e7af3 100644
+--- a/pulseaudio.spec.in
++++ b/pulseaudio.spec.in
+@@ -129,6 +129,13 @@ Group:   Multimedia/PulseAudio
+ %description module-combine-sink
+ PA module-combine-sink.
++%package module-augment-properties
++Summary: PA module-augment-properties
++Group:   Multimedia/PulseAudio
++
++%description module-augment-properties
++PA module-augment-properties.
++
+ %package module-dbus-protocol
+ Summary: PA module-dbus-protocol
+ Group:   Multimedia/PulseAudio
+@@ -291,7 +298,6 @@ install -m 644 src/default.pa %{buildroot}/%{_sysconfdir}/pulse
+ %{_libdir}/pulse-%{pulseversion}/modules/module-suspend-on-idle.so
+ %{_libdir}/pulse-%{pulseversion}/modules/module-volume-restore.so
+ %{_libdir}/pulse-%{pulseversion}/modules/module-alsa-card.so
+-%{_libdir}/pulse-%{pulseversion}/modules/module-augment-properties.so
+ %{_libdir}/pulse-%{pulseversion}/modules/module-card-restore.so
+ %{_libdir}/pulse-%{pulseversion}/modules/module-sine-source.so
+ %{_libdir}/pulse-%{pulseversion}/modules/module-loopback.so
+@@ -369,6 +375,10 @@ install -m 644 src/default.pa %{buildroot}/%{_sysconfdir}/pulse
+ %defattr(-,root,root,-)
+ %{_libdir}/pulse-%{pulseversion}/modules/module-combine-sink.so
++%files module-augment-properties
++%defattr(-,root,root,-)
++%{_libdir}/pulse-%{pulseversion}/modules/module-augment-properties.so
++
+ %files module-dbus-protocol
+ %defattr(-,root,root,-)
+ %{_libdir}/pulse-%{pulseversion}/modules/module-dbus-protocol.so
+-- 
+1.7.7.6
+
diff --git a/packaging/0013-release-added-no-verify-to-suppress-whitespace-error.patch b/packaging/0013-release-added-no-verify-to-suppress-whitespace-error.patch
new file mode 100644 (file)
index 0000000..0f3d302
--- /dev/null
@@ -0,0 +1,26 @@
+From 49ee3573417075982a98d231bf0ee31fd69efac8 Mon Sep 17 00:00:00 2001
+From: Jaska Uimonen <jaska.uimonen@intel.com>
+Date: Tue, 24 Jul 2012 14:33:03 +0300
+Subject: [PATCH 13/13] release: added no-verify to suppress whitespace errors
+ in git
+
+---
+ obs-export.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/obs-export.sh b/obs-export.sh
+index 43c66d6..f7e0260 100755
+--- a/obs-export.sh
++++ b/obs-export.sh
+@@ -157,7 +157,7 @@ if [ "$MODE" = "gerrit" -a "$RELEASE" = "yes" ]; then
+     git branch $branch $UPSTREAM_BASE && \
+         git checkout $branch && \
+         git add packaging && \
+-        git commit -m "release: added packaging for gerrit." packaging && \
++        git commit -n -m "release: added packaging for gerrit." packaging && \
+         echo "* $(date '+%a %b %d %H:%M:%S %Z %Y') $AUTHOR - $VERSION" \
+             > $chlog && \
+         echo "- release: releasing $VERSION..." >> $chlog && \
+-- 
+1.7.7.6
+
diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec
new file mode 100644 (file)
index 0000000..3000ec5
--- /dev/null
@@ -0,0 +1,437 @@
+%define pulseversion 2.0
+
+Name:       pulseaudio
+Summary:    Improved Linux sound server
+Version:    2.0
+Release:    0
+Group:      Multimedia/PulseAudio
+License:    LGPLv2+
+URL:        http://pulseaudio.org
+Source0:    http://127.0.0.1/pulseaudio-2.0.tar.gz
+Patch0: 0001-build-sys-install-files-for-a-module-development.patch
+Patch1: 0002-jack-detection-fix-for-wired-headset.patch
+Patch2: 0003-packaging-added-spec.in-and-pulseaudio.service.patch
+Patch3: 0004-configuration-IVI-additions-to-default-config-files.patch
+Patch4: 0005-packaging-let-the-basic-package-pull-in-the-config.patch
+Patch5: 0006-scripts-added-OBS-exporter-script.patch
+Patch6: 0007-packaging-updated-build-dependencies-to-be-in-line-w.patch
+Patch7: 0008-packaging-put-systemd-service-units-under-_libdir.patch
+Patch8: 0009-packaging-module-devel-requires-version-exact-libs-d.patch
+Patch9: 0010-scripts-OBS-exporter-fix-do-read-without-escape-proc.patch
+Patch10: 0011-scripts-initial-release-implementation.patch
+Patch11: 0012-packaging-make-separate-package-for-module-augment-p.patch
+Patch12: 0013-release-added-no-verify-to-suppress-whitespace-error.patch
+Requires:   udev
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires: pulseaudio-config
+BuildRequires:  pkgconfig(speexdsp)
+BuildRequires:  pkgconfig(sndfile)
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gconf-2.0)
+BuildRequires:  pkgconfig(bluez)
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(xi)
+BuildRequires:  pkgconfig(libudev)
+BuildRequires:  libatomic_ops-devel
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  json-c-devel
+BuildRequires:  m4
+BuildRequires:  libtool-ltdl-devel
+BuildRequires:  libtool
+BuildRequires:  intltool
+BuildRequires:  fdupes
+
+
+%description
+PulseAudio is a sound server for Linux and other Unix like operating
+systems. It is intended to be an improved drop-in replacement for the
+Enlightened Sound Daemon (ESOUND).
+
+%package libs
+Summary:    PulseAudio client libraries
+Group:      Multimedia/PulseAudio
+Requires:   %{name} = %{version}-%{release}
+
+%description libs
+Client libraries used by applications that access a PulseAudio sound server
+via PulseAudio's native interface.
+
+
+%package libs-devel
+Summary:    PulseAudio client development headers and libraries
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description libs-devel
+Headers and libraries for developing applications that access a PulseAudio
+sound server via PulseAudio's native interface
+
+
+%package utils
+Summary:    Command line tools for the PulseAudio sound server
+Group:      Multimedia/PulseAudio
+Requires:   %{name} = %{version}-%{release}
+
+%description utils
+These tools provide command line access to various features of the
+PulseAudio sound server. Included tools are:
+pabrowse - Browse available PulseAudio servers on the local network.
+paplay - Playback a WAV file via a PulseAudio sink.
+pacat - Cat raw audio data to a PulseAudio sink.
+parec - Cat raw audio data from a PulseAudio source.
+pacmd - Connect to PulseAudio's built-in command line control interface.
+pactl - Send a control command to a PulseAudio server.
+padsp - /dev/dsp wrapper to transparently support OSS applications.
+pax11publish - Store/retrieve PulseAudio default server/sink/source
+settings in the X11 root window.
+
+
+%package module-bluetooth
+Summary:    Bluetooth module for PulseAudio sound server
+Group:      Multimedia/PulseAudio
+Requires:   %{name} = %{version}-%{release}
+
+%description module-bluetooth
+This module enables PulseAudio to work with bluetooth devices, like headset
+or audio gatewa
+
+%package module-devel
+Summary:        Headers and libraries for PulseAudio module development
+License:        LGPLv2+
+Group:          Development/Libraries
+Requires:       %{name}-libs-devel = %{version}-%{release}
+
+%package config
+Summary: Default configuration for PulseAudio.
+Group: System Environment/Configuration
+
+%description config
+Default configuration for PulseAudio.
+
+%description module-devel
+Headers and libraries for developing pulseaudio modules
+
+#%package module-zeroconf
+#Summary: PA module-zeroconf
+#Group:   Multimedia/PulseAudio
+#
+#%description module-zeroconf
+#PA module-zeroconf.
+
+%package module-raop
+Summary: PA module-raop
+Group:   Multimedia/PulseAudio
+
+%description module-raop
+PA module-raop.
+
+%package module-filter
+Summary: PA module-filter
+Group:   Multimedia/PulseAudio
+
+%description module-filter
+PA module-filter.
+
+%package module-combine-sink
+Summary: PA module-combine-sink
+Group:   Multimedia/PulseAudio
+
+%description module-combine-sink
+PA module-combine-sink.
+
+%package module-augment-properties
+Summary: PA module-augment-properties
+Group:   Multimedia/PulseAudio
+
+%description module-augment-properties
+PA module-augment-properties.
+
+%package module-dbus-protocol
+Summary: PA module-dbus-protocol
+Group:   Multimedia/PulseAudio
+
+%description module-dbus-protocol
+PA module-dbus-protocol.
+
+%package module-null-source
+Summary: PA module-null-source
+Group:   Multimedia/PulseAudio
+
+%description module-null-source
+PA module-null-source.
+
+%package module-switch-on-connect
+Summary: PA module-swich-on-connect
+Group:   Multimedia/PulseAudio
+
+%description module-switch-on-connect
+PA module-swich-on-connect.
+
+%package localization
+Summary:    PA localization files.
+Group:      Multimedia/PulseAudio
+Requires:   %{name} = %{version}-%{release}
+
+%description localization
+PA localization files.
+
+%package vala-bindings
+Summary:    PA Vala bindings.
+Group:      Multimedia/PulseAudio
+Requires:   %{name} = %{version}-%{release}
+
+%description vala-bindings
+PA Vala bindings.
+
+
+%prep
+%setup -q -n pulseaudio-2.0
+echo "%{version}" > .tarball-version
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+./bootstrap.sh
+
+%build
+CPUS="`cat /proc/cpuinfo  | grep ^processor | wc -l`"
+JOBS="-j$(($CPUS + 1))"
+
+unset LD_AS_NEEDED
+export LDFLAGS+="-Wl,--no-as-needed"
+%configure --disable-static --enable-alsa --disable-ipv6 --disable-oss-output --disable-oss-wrapper --enable-bluez --disable-x11 --disable-hal --disable-hal-compat --disable-lirc --disable-avahi --disable-jack --without-fftw --disable-xen
+make $JOBS
+
+%install
+rm -rf %{buildroot}
+%make_install
+
+install -d  %{buildroot}/%{_libdir}/systemd/system
+install -m 644 pulseaudio.service %{buildroot}/%{_libdir}/systemd/system/pulseaudio.service
+mkdir -p  %{buildroot}/%{_libdir}/systemd/system/multi-user.target.wants
+ln -s  ../pulseaudio.service  %{buildroot}/%{_libdir}/systemd/system/multi-user.target.wants/pulseaudio.service
+
+rm -rf  %{buildroot}/etc/xdg/autostart/pulseaudio-kde.desktop
+rm -rf  %{buildroot}/usr/bin/start-pulseaudio-kde
+rm -rf %{buildroot}/%{_libdir}/pulse-%{pulseversion}/modules/module-device-manager.so
+
+%find_lang pulseaudio
+fdupes  %{buildroot}/%{_datadir}
+fdupes  %{buildroot}/%{_includedir}
+
+# get rid of *.la files
+rm -f %{buildroot}/%{_libdir}/*.la
+rm -f %{buildroot}/%{_libdir}/pulseaudio/*.la
+
+# put the default configuration file in place
+install -m 644 src/default.pa %{buildroot}/%{_sysconfdir}/pulse
+
+
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+
+%post module-bluetooth -p /sbin/ldconfig
+%postun module-bluetooth -p /sbin/ldconfig
+
+
+%docs_package
+
+%lang_package
+
+
+%files
+%defattr(-,root,root,-)
+%doc LICENSE GPL LGPL
+%dir %{_sysconfdir}/pulse/
+%{_bindir}/esdcompat
+%{_bindir}/pulseaudio
+%dir %{_libexecdir}/pulse
+%{_libexecdir}/pulse/*
+%{_libdir}/libpulsecore-%{pulseversion}.so
+%{_libdir}/libpulse-mainloop-glib.so.*
+/lib/udev/rules.d/90-pulseaudio.rules
+%{_datadir}/pulseaudio/alsa-mixer/paths/*
+%{_datadir}/pulseaudio/alsa-mixer/profile-sets/*
+%{_bindir}/pamon
+/etc/dbus-1/system.d/pulseaudio-system.conf
+# cmake stuff
+%{_libdir}/cmake/PulseAudio/PulseAudioConfig.cmake
+%{_libdir}/cmake/PulseAudio/PulseAudioConfigVersion.cmake
+# list all modules
+%{_libdir}/pulse-%{pulseversion}/modules/libalsa-util.so
+%{_libdir}/pulse-%{pulseversion}/modules/libcli.so
+%{_libdir}/pulse-%{pulseversion}/modules/libprotocol-cli.so
+%{_libdir}/pulse-%{pulseversion}/modules/libprotocol-http.so
+%{_libdir}/pulse-%{pulseversion}/modules/libprotocol-native.so
+%{_libdir}/pulse-%{pulseversion}/modules/libprotocol-simple.so
+%{_libdir}/pulse-%{pulseversion}/modules/librtp.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-alsa-sink.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-alsa-source.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-always-sink.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-console-kit.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-device-restore.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-stream-restore.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-cli-protocol-tcp.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-cli-protocol-unix.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-cli.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-combine.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-default-device-restore.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-detect.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-esound-sink.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-http-protocol-tcp.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-http-protocol-unix.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-intended-roles.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-ladspa-sink.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-match.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-mmkbd-evdev.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-native-protocol-fd.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-native-protocol-tcp.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-native-protocol-unix.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-null-sink.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-pipe-sink.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-pipe-source.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-position-event-sounds.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-remap-sink.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-rescue-streams.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-rtp-recv.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-rtp-send.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-simple-protocol-tcp.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-simple-protocol-unix.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-sine.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-tunnel-sink.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-tunnel-source.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-suspend-on-idle.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-volume-restore.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-alsa-card.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-card-restore.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-sine-source.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-loopback.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-rygel-media-server.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-echo-cancel.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-virtual-sink.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-virtual-source.so
+%{_libdir}/pulse-%{pulseversion}/modules/libprotocol-esound.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-esound-compat-spawnfd.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-esound-compat-spawnpid.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-esound-protocol-tcp.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-esound-protocol-unix.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-gconf.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-udev-detect.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-role-cork.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-switch-on-port-available.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-virtual-surround-sink.so
+%{_libdir}/systemd/system/pulseaudio.service
+%{_libdir}/systemd/system/multi-user.target.wants/pulseaudio.service
+
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libpulse.so.*
+%{_libdir}/libpulse-simple.so.*
+%{_libdir}/pulseaudio/libpulsecommon-*.so
+
+%files libs-devel
+%defattr(-,root,root,-)
+%{_includedir}/pulse/*
+%{_libdir}/libpulse.so
+%{_libdir}/libpulse-simple.so
+%{_libdir}/pkgconfig/libpulse-simple.pc
+%{_libdir}/pkgconfig/libpulse.pc
+%{_datadir}/vala/vapi/libpulse.vapi
+%{_libdir}/pkgconfig/libpulse-mainloop-glib.pc
+%{_libdir}/libpulse-mainloop-glib.so
+
+%files utils
+%defattr(-,root,root,-)
+%doc %{_mandir}/man1/*
+%doc %{_mandir}/man5/*
+%{_bindir}/pacat
+%{_bindir}/pacmd
+%{_bindir}/pactl
+%{_bindir}/paplay
+%{_bindir}/parec
+%{_bindir}/pamon
+%{_bindir}/parecord
+%{_bindir}/pasuspender
+
+%files module-bluetooth
+%defattr(-,root,root,-)
+%{_libdir}/pulse-%{pulseversion}/modules/module-bluetooth-proximity.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-bluetooth-device.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-bluetooth-discover.so
+%{_libdir}/pulse-%{pulseversion}/modules/libbluetooth-ipc.so
+%{_libdir}/pulse-%{pulseversion}/modules/libbluetooth-sbc.so
+%{_libdir}/pulse-%{pulseversion}/modules/libbluetooth-util.so
+
+#%files module-zeroconf
+#%defattr(-,root,root,-)
+#%{_libdir}/pulse-%{pulseversion}/modules/libavahi-wrap.so
+#%{_libdir}/pulse-%{pulseversion}/modules/module-zeroconf*.so
+
+%files module-raop
+%defattr(-,root,root,-)
+%{_libdir}/pulse-%{pulseversion}/modules/libraop.so
+%{_libdir}/pulse-%{pulseversion}/modules/module-raop*.so
+
+%files module-filter
+%defattr(-,root,root,-)
+%{_libdir}/pulse-%{pulseversion}/modules/module-filter-*.so
+
+%files module-combine-sink
+%defattr(-,root,root,-)
+%{_libdir}/pulse-%{pulseversion}/modules/module-combine-sink.so
+
+%files module-augment-properties
+%defattr(-,root,root,-)
+%{_libdir}/pulse-%{pulseversion}/modules/module-augment-properties.so
+
+%files module-dbus-protocol
+%defattr(-,root,root,-)
+%{_libdir}/pulse-%{pulseversion}/modules/module-dbus-protocol.so
+
+%files module-null-source
+%defattr(-,root,root,-)
+%{_libdir}/pulse-%{pulseversion}/modules/module-null-source.so
+
+%files module-switch-on-connect
+%defattr(-,root,root,-)
+%{_libdir}/pulse-%{pulseversion}/modules/module-switch-on-connect.so
+
+%files config
+%defattr(-,root,root,-)
+%{_sysconfdir}/pulse/default.pa
+%{_sysconfdir}/pulse/client.conf
+%{_sysconfdir}/pulse/default.pa
+%{_sysconfdir}/pulse/system.pa
+%{_sysconfdir}/pulse/daemon.conf
+
+%files module-devel
+%defattr(-,root,root)
+%{_includedir}/pulsecore
+%{_libdir}/pkgconfig/pulseaudio-module-devel.pc
+
+%files localization
+%defattr(-,root,root,-)
+%{_datadir}/locale/*/LC_MESSAGES/pulseaudio.mo
+
+%files vala-bindings
+%defattr(-,root,root,-)
+%{_datadir}/vala/vapi/*