Fixed package groups

diff --git a/packaging/pulseaudio.changes b/packaging/pulseaudio.changes
index fc813dc..bad8b03 100644 (file)
--- a/packaging/pulseaudio.changes
+++ b/packaging/pulseaudio.changes
@@ -1,3 +1,6 @@
+* Fri Mar 22 2013 Anas Nashif <anas.nashif@intel.com> accepted/trunk/20130207.031005@3411be6
+- Fixed package groups
+
 * Thu Jan 31 2013 Anas Nashif <anas.nashif@intel.com> submit/trunk/20130104.143337@72303c1
 - enable tizen with all options
 

diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec
index b6d13b8..f1b1ff4 100644 (file)
--- a/packaging/pulseaudio.spec
+++ b/packaging/pulseaudio.spec
@@ -1,31 +1,30 @@
+#
+
 %bcond_with tizen
 
 Name:           pulseaudio
 Version:        2.1
 Release:        0
+License:        GPL-2.0+ ; LGPL-2.1+
 %define drvver  2.1
 %define soname  0
 Summary:        A Networked Sound Server
-License:        GPL-2.0+ ; LGPL-2.1+
-Group:          System/Sound Daemons
 Url:            http://pulseaudio.org
+Group:          Multimedia/Audio
 Source:         http://www.freedesktop.org/software/pulseaudio/releases/%{name}-%{version}.tar.xz
 Source1:        default.pa-for-gdm
 Source2:        setup-pulseaudio
 Source3:        sysconfig.sound-pulseaudio
 Source99:       baselibs.conf
-BuildRequires:  pkgconfig(alsa)
-BuildRequires:  bluez-devel
 BuildRequires:  fdupes
 BuildRequires:  gdbm-devel
 BuildRequires:  intltool
-BuildRequires:  libopenssl-devel
-BuildRequires:  libsndfile-devel
+BuildRequires:  libcap-devel
 BuildRequires:  libtool
 BuildRequires:  libudev-devel >= 143
-BuildRequires:  orc
-BuildRequires:  speex-devel
 BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(bluez)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xi)
 BuildRequires:  pkgconfig(x11-xcb)
@@ -34,17 +33,19 @@ BuildRequires:  pkgconfig(ice)
 BuildRequires:  pkgconfig(sm)
 BuildRequires:  pkgconfig(xtst)
 BuildRequires:  pkgconfig(dbus-1)
-BuildRequires:  libcap-devel
-BuildRequires:  orc
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(json) >= 0.9
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(orc-0.4)
+BuildRequires:  pkgconfig(sndfile)
+BuildRequires:  pkgconfig(speex)
 %if %{with tizen}
-BuildRequires:  pkgconfig(vconf)
-BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(capi-system-power)
+BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(vconf)
 %endif
-Requires(pre):         pwdutils
 Requires:       udev >= 146
+Requires(pre):         pwdutils
 
 %description
 pulseaudio is a networked sound server for Linux, other Unix like
@@ -53,7 +54,7 @@ improved drop-in replacement for the Enlightened Sound Daemon (ESOUND).
 
 %package esound-compat
 Summary:        ESOUND compatibility for PulseAudio
-Group:          System/Sound Daemons
+Group:          Multimedia/Audio
 Requires:       %{name} = %{version}
 
 %description esound-compat
@@ -65,17 +66,17 @@ This package provides the compatibility layer for drop-in replacement
 of ESOUND.
 
 %package module-devel
+License:        LGPL-2.0+
 Summary:        Headers and libraries for PulseAudio module development
-License:        LGPLv2+
 Group:          Development/Libraries
-Requires:       libpulse-devel = %{version}-%{release}
+Requires:       libpulse-devel = %{version}
 
 %description module-devel
 Headers and libraries for developing pulseaudio modules
 
 %package module-x11
 Summary:        X11 module for PulseAudio
-Group:          System/Sound Daemons
+Group:          Multimedia/Audio
 Requires:       %{name} = %{version}
 Requires:       %{name}-utils = %{version}
 
@@ -89,7 +90,7 @@ the PulseAudio sound server on X11 startup.
 
 %package module-zeroconf
 Summary:        Zeroconf module for PulseAudio
-Group:          System/Sound Daemons
+Group:          Multimedia/Audio
 Requires:       %{name} = %{version}
 
 %description module-zeroconf
@@ -101,7 +102,7 @@ This package provides zeroconf network support for the PulseAudio sound server
 
 %package module-jack
 Summary:        JACK support for the PulseAudio sound server
-Group:          System/Sound Daemons
+Group:          Multimedia/Audio
 Requires:       %{name} = %{version}
 
 %description module-jack
@@ -113,7 +114,7 @@ This package includes support for Jack-based applications.
 
 %package module-bluetooth
 Summary:        Bluetooth support for the PulseAudio sound server
-Group:          System/Sound Daemons
+Group:          Multimedia/Audio
 Requires:       %{name} = %{version}
 Requires:       bluez >= 4.34
 
@@ -126,7 +127,7 @@ Contains Bluetooth audio (A2DP/HSP/HFP) support for the PulseAudio sound server.
 
 %package module-gconf
 Summary:        GCONF module for PulseAudio
-Group:          System/Sound Daemons
+Group:          Multimedia/Audio
 Requires:       %{name} = %{version}
 
 %description module-gconf
@@ -138,7 +139,7 @@ This package provides gconf storage of PulseAudio sound server settings.
 
 %package -n libpulse
 Summary:        Client interface to PulseAudio
-Group:          System/Libraries
+Group:          Multimedia/Audio
 
 %description -n libpulse
 pulseaudio is a networked sound server for Linux and other Unix like
@@ -149,8 +150,8 @@ This package contains the system libraries for clients of pulseaudio
 sound server.
 
 %package -n libpulse-mainloop-glib
-Summary:        GLIB  2.0 Main Loop wrapper for PulseAudio
-Group:          System/Sound Daemons
+Summary:        GLIB  2
+Group:          Multimedia/Audio
 
 %description -n libpulse-mainloop-glib
 pulseaudio is a networked sound server for Linux and other Unix like
@@ -162,7 +163,7 @@ sound server.
 
 %package -n libpulse-devel
 Summary:        Development package for the pulseaudio library
-Group:          Development/Libraries/C and C++
+Group:          Development/Libraries
 Requires:       libpulse = %{version}
 Requires:       libpulse-mainloop-glib = %{version}
 Requires:       pkgconfig
@@ -178,10 +179,10 @@ pulseaudio library.
 
 %package utils
 Summary:        PulseAudio utilities
-Group:          System/Sound Daemons
+Group:          Multimedia/Audio
 Requires:       %{name} = %{version}
-Requires:       libpulse-mainloop-glib = %{version}
 Requires:       libpulse = %{version}
+Requires:       libpulse-mainloop-glib = %{version}
 
 %description utils
 pulseaudio is a networked sound server for Linux and other Unix like
@@ -193,7 +194,7 @@ server.
 
 %package gdm-hooks
 Summary:        PulseAudio GDM integration
-Group:          Productivity/Multimedia/Other
+Group:          Multimedia/Audio
 Requires:       %{name} = %{version}
 Requires:       gdm >= 2.22
 Requires(pre):  gdm
@@ -243,12 +244,9 @@ touch %{buildroot}%{_sysconfdir}/profile.d/pulseaudio.csh
 mkdir -p %{buildroot}%{_localstatedir}/lib/gdm/.pulse
 cp $RPM_SOURCE_DIR/default.pa-for-gdm %{buildroot}%{_localstatedir}/lib/gdm/.pulse/default.pa
 ln -s esdcompat %{buildroot}%{_bindir}/esd
-rm -rf %{buildroot}/etc/xdg/autostart/pulseaudio-kde.desktop
+rm -rf %{buildroot}%{_sysconfdir}/xdg/autostart/pulseaudio-kde.desktop
 
 install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/sound
-%clean
-rm -rf %{buildroot}
-
 %pre
 groupadd -r pulse &>/dev/null || :
 useradd -r -c 'PulseAudio daemon' \
@@ -364,7 +362,7 @@ setup-pulseaudio --auto > /dev/null
 %{_libdir}/pulse-%{drvver}/modules/module-policy.so
 %endif
 
-/usr/lib/udev/rules.d/90-pulseaudio.rules
+%{_prefix}/lib/udev/rules.d/90-pulseaudio.rules
 %dir %{_sysconfdir}/pulse/
 %config(noreplace) %{_sysconfdir}/pulse/daemon.conf
 %config(noreplace) %{_sysconfdir}/pulse/default.pa
@@ -428,13 +426,6 @@ setup-pulseaudio --auto > /dev/null
 %{_libdir}/pulse-%{drvver}/modules/module-bluetooth-proximity.so
 %attr(0755,root,root) %{_libexecdir}/pulse/proximity-helper
 
-%files module-gconf
-%defattr(-,root,root)
-#%dir %{_libexecdir}/pulse
-#%{_libdir}/pulse-%{drvver}/modules/module-gconf.so
-#%{_libexecdir}/pulse/gconf-helper
-
-
 %files module-x11
 %defattr(-,root,root)
 %{_sysconfdir}/xdg/autostart/pulseaudio.desktop