[meego-commits] 5713: Changes to Trunk:Testing/libcanberra
Vivian Zhang
vivian.zhang at intel.com
Thu Jul 15 05:10:04 UTC 2010
Hi,
I have made the following changes to libcanberra in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Vivian Zhang
[This message was auto-generated]
---
Request #5713:
submit: home:vivian:branches:Trunk:Testing/libcanberra(r4)(cleanup) -> Trunk:Testing/libcanberra
Message:
Upgrade to 0.25, use spectacle and disable tdb & gtk3 support
State: new 2010-07-14T17:04:47 vivian
Comment: None
changes files:
--------------
--- libcanberra.changes
+++ libcanberra.changes
@@ -0,0 +1,3 @@
+* Mon Jul 12 2010 Vivian Zhang <vivian.zhang at intel.com> - 0.25
+- Upgrade to 0.25, use spectacle and disable tdb & gtk3 support
+
old:
----
libcanberra-0.18.tar.gz
new:
----
Makefile
libcanberra-0.25.tar.gz
libcanberra.yaml
spec files:
-----------
--- libcanberra.spec
+++ libcanberra.spec
@@ -1,36 +1,52 @@
+#
+# Do not Edit! Generated by:
+# spectacle version 0.17
+#
+# >> macros
+# << macros
+
Name: libcanberra
-Version: 0.18
-Release: 1
Summary: Portable Sound Event Library
+Version: 0.25
+Release: 1
Group: System/Libraries
-Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
License: LGPLv2+
-Url: http://git.0pointer.de/?p=libcanberra.git;a=summary
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtk2-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: libvorbis-devel
-BuildRequires: libtool-ltdl-devel
-BuildRequires: gtk-doc
-BuildRequires: pulseaudio-devel >= 0.9.15
-BuildRequires: gstreamer-devel
-BuildRequires: libtdb-devel
-BuildRequires: GConf2-devel
-BuildRequires: gettext-devel
+URL: http://git.0pointer.de/?p=libcanberra.git;a=summary
+Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
+Source100: libcanberra.yaml
Requires: sound-theme-freedesktop
Requires: pulseaudio >= 0.9.15
Requires(pre): GConf2
Requires(preun): GConf2
Requires(post): GConf2
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: pkgconfig(alsa)
+BuildRequires: pkgconfig(vorbis)
+BuildRequires: pkgconfig(gtk-doc)
+BuildRequires: pkgconfig(gstreamer-0.10)
+BuildRequires: libtool-ltdl-devel
+BuildRequires: pulseaudio-devel >= 0.9.15
+BuildRequires: GConf2-devel
+BuildRequires: gettext-devel
+
%description
A small and lightweight implementation of the XDG Sound Theme Specification
(http://0pointer.de/public/sound-theme-spec.html).
+
+
%package gtk2
Summary: Gtk+ Bindings for libcanberra
Group: System/Libraries
Requires: %{name} = %{version}-%{release}
+Requires(pre): GConf2
+Requires(preun): GConf2
+Requires(post): /sbin/ldconfig
+Requires(post): GConf2
+Requires(postun): /sbin/ldconfig
%description gtk2
Gtk+ bindings for libcanberra
@@ -46,48 +62,80 @@
%description devel
Development Files for libcanberra Client Development
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-%post gtk2
-/sbin/ldconfig
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/libcanberra.schemas > /dev/null || :
+%prep
+%setup -q -n %{name}-%{version}
-%postun gtk2 -p /sbin/ldconfig
+# >> setup
+# << setup
+
+%build
+# >> build pre
+# << build pre
+
+%configure --disable-static \
+ --enable-pulse \
+ --enable-alsa \
+ --enable-null \
+ --enable-gstreamer \
+ --disable-oss \
+ --with-builtin=dso \
+ --disable-tdb \
+ --disable-gtk3
+
+make %{?jobs:-j%jobs}
+
+# >> build post
+# << build post
+%install
+rm -rf %{buildroot}
+# >> install pre
+# << install pre
+%make_install
+
+# >> install post
+rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
+
+# << install post
+
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
%pre gtk2
+# >> pre gtk2
if [ "$1" -gt 1 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-install-rule \
- %{_sysconfdir}/gconf/schemas/libcanberra.schemas >& /dev/null || :
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+%{_sysconfdir}/gconf/schemas/libcanberra.schemas >& /dev/null || :
fi
+# << pre gtk2
%preun gtk2
+# >> preun gtk2
if [ "$1" -eq 0 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/libcanberra.schemas >& /dev/null || :
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-uninstall-rule \
+%{_sysconfdir}/gconf/schemas/libcanberra.schemas >& /dev/null || :
fi
+# << preun gtk2
-%prep
-%setup -q
+%post gtk2
+/sbin/ldconfig
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+ %{_sysconfdir}/gconf/schemas/libcanberra.schemas > /dev/null || :
+
+%postun gtk2 -p /sbin/ldconfig
-%build
-%configure --disable-static --enable-pulse --enable-alsa --enable-null --enable-gstreamer --disable-oss --with-builtin=dso
-make %{?_smp_mflags}
-%install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-find $RPM_BUILD_ROOT \( -name *.a -o -name *.la \) -exec rm {} \;
-rm $RPM_BUILD_ROOT%{_docdir}/libcanberra/README
-%clean
-rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+# >> files
%doc README LGPL
%{_libdir}/libcanberra.so.*
%dir %{_libdir}/libcanberra-%{version}
@@ -96,9 +144,12 @@
%{_libdir}/libcanberra-%{version}/libcanberra-null.so
%{_libdir}/libcanberra-%{version}/libcanberra-multi.so
%{_libdir}/libcanberra-%{version}/libcanberra-gstreamer.so
+# << files
+
%files gtk2
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+# >> files gtk2
%{_libdir}/libcanberra-gtk.so.*
%{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so
%{_bindir}/canberra-gtk-play
@@ -110,9 +161,11 @@
%dir %{_datadir}/gdm/autostart/LoginWindow/
%{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
%{_sysconfdir}/gconf/schemas/libcanberra.schemas
+# << files gtk2
%files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+# >> files devel
%doc %{_datadir}/gtk-doc/html/libcanberra
%{_includedir}/canberra-gtk.h
%{_includedir}/canberra.h
@@ -122,3 +175,5 @@
%{_libdir}/pkgconfig/libcanberra.pc
%{_datadir}/vala/vapi/libcanberra-gtk.vapi
%{_datadir}/vala/vapi/libcanberra.vapi
+# << files devel
+
other changes:
--------------
++++++ Makefile (new)
--- Makefile
+++ Makefile
+PKG_NAME := libcanberra
+SPECFILE = $(addsuffix .spec, $(PKG_NAME))
+YAMLFILE = $(addsuffix .yaml, $(PKG_NAME))
+
+include /usr/share/packaging-tools/Makefile.common
+
++++++ libcanberra-0.18.tar.gz -> libcanberra-0.25.tar.gz
36853 lines of diff (skipped)
++++++ libcanberra.yaml (new)
--- libcanberra.yaml
+++ libcanberra.yaml
+Name: libcanberra
+Summary: Portable Sound Event Library
+Version: 0.25
+Release: 1
+Group: System/Libraries
+License: LGPLv2+
+URL: http://git.0pointer.de/?p=libcanberra.git;a=summary
+Sources:
+ - http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz
+Description: |
+ A small and lightweight implementation of the XDG Sound Theme Specification
+ (http://0pointer.de/public/sound-theme-spec.html).
+
+Requires:
+ - sound-theme-freedesktop
+ - pulseaudio >= 0.9.15
+RequiresPre:
+ - GConf2
+RequiresPreUn:
+ - GConf2
+RequiresPost:
+ - GConf2
+PkgBR:
+ - libtool-ltdl-devel
+ - pulseaudio-devel >= 0.9.15
+ - GConf2-devel
+ - gettext-devel
+PkgConfigBR:
+ - gtk+-2.0
+ - alsa
+ - vorbis
+ - gtk-doc
+ - gstreamer-0.10
+Configure: configure
+ConfigOptions:
+ - --enable-pulse
+ - --enable-alsa
+ - --enable-null
+ - --enable-gstreamer
+ - --disable-oss
+ - --with-builtin=dso
+ - --disable-tdb
+ - --disable-gtk3
+Builder: make
+SubPackages:
+ - Name: gtk2
+ Summary: Gtk+ Bindings for libcanberra
+ Group: System/Libraries
+ Description: Gtk+ bindings for libcanberra
+
+ - Name: devel
+ Summary: Development Files for libcanberra Client Development
+ Group: Development/Libraries
+ Description: Development Files for libcanberra Client Development
+ Requires:
+ - pkgconfig
+ - gtk-doc
+ - gtk2-devel
+
More information about the MeeGo-commits
mailing list