[mate-media/f16] new upstream release, gstreamer patch
Dan Mashal
vicodan at fedoraproject.org
Tue Dec 11 05:56:14 UTC 2012
commit 890d7d6bb6d353c20c7e9a6d9a3684483137a839
Author: Dan Mashal <dan.mashal at gmail.com>
Date: Mon Dec 10 21:55:58 2012 -0800
new upstream release, gstreamer patch
.gitignore | 1 +
commits_rollup.patch | 240 ++++++++++++++++++++++++++++++++++++++++++++++++++
mate-media.spec | 59 +++++++++----
sources | 2 +-
4 files changed, 283 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5cf285c..64638b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/mate-media-1.4.0.tar.xz
/mate-media-1.5.0.tar.xz
+/mate-media-1.5.1.tar.xz
diff --git a/commits_rollup.patch b/commits_rollup.patch
new file mode 100644
index 0000000..ace0a8f
--- /dev/null
+++ b/commits_rollup.patch
@@ -0,0 +1,240 @@
+diff -uNrp mate-media-1.5.1/COPYING mate-media/COPYING
+--- mate-media-1.5.1/COPYING 2012-12-09 07:07:08.000000000 -0800
++++ mate-media/COPYING 2012-12-10 21:13:27.110488577 -0800
+@@ -1,12 +1,12 @@
+- GNU GENERAL PUBLIC LICENSE
+- Version 2, June 1991
++ GNU GENERAL PUBLIC LICENSE
++ Version 2, June 1991
+
+- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+- Preamble
++ Preamble
+
+ The licenses for most software are designed to take away your
+ freedom to share and change it. By contrast, the GNU General Public
+@@ -15,7 +15,7 @@ software--to make sure the software is f
+ General Public License applies to most of the Free Software
+ Foundation's software and to any other program whose authors commit to
+ using it. (Some other Free Software Foundation software is covered by
+-the GNU Library General Public License instead.) You can apply it to
++the GNU Lesser General Public License instead.) You can apply it to
+ your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+@@ -55,8 +55,8 @@ patent must be licensed for everyone's f
+
+ The precise terms and conditions for copying, distribution and
+ modification follow.
+-
+- GNU GENERAL PUBLIC LICENSE
++
++ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+@@ -110,7 +110,7 @@ above, provided that you also meet all o
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+-
++
+ These requirements apply to the modified work as a whole. If
+ identifiable sections of that work are not derived from the Program,
+ and can be reasonably considered independent and separate works in
+@@ -168,7 +168,7 @@ access to copy from a designated place,
+ access to copy the source code from the same place counts as
+ distribution of the source code, even though third parties are not
+ compelled to copy the source along with the object code.
+-
++
+ 4. You may not copy, modify, sublicense, or distribute the Program
+ except as expressly provided under this License. Any attempt
+ otherwise to copy, modify, sublicense or distribute the Program is
+@@ -225,7 +225,7 @@ impose that choice.
+
+ This section is intended to make thoroughly clear what is believed to
+ be a consequence of the rest of this License.
+-
++
+ 8. If the distribution and/or use of the Program is restricted in
+ certain countries either by patents or by copyrighted interfaces, the
+ original copyright holder who places the Program under this License
+@@ -255,7 +255,7 @@ make exceptions for this. Our decision
+ of preserving the free status of all derivatives of our free software and
+ of promoting the sharing and reuse of software generally.
+
+- NO WARRANTY
++ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+ FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE
+ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGES.
+
+- END OF TERMS AND CONDITIONS
+-
+- How to Apply These Terms to Your New Programs
++ END OF TERMS AND CONDITIONS
++
++ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+ possible use to the public, the best way to achieve this is to make it
+@@ -303,17 +303,16 @@ the "copyright" line and a pointer to wh
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+- You should have received a copy of the GNU General Public License
+- along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+-
++ You should have received a copy of the GNU General Public License along
++ with this program; if not, write to the Free Software Foundation, Inc.,
++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Also add information on how to contact you by electronic and paper mail.
+
+ If the program is interactive, make it output a short notice like this
+ when it starts in an interactive mode:
+
+- Gnomovision version 69, Copyright (C) year name of author
++ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the
+ This General Public License does not permit incorporating your program into
+ proprietary programs. If your program is a subroutine library, you may
+ consider it more useful to permit linking proprietary applications with the
+-library. If this is what you want to do, use the GNU Library General
++library. If this is what you want to do, use the GNU Lesser General
+ Public License instead of this License.
+diff -uNrp mate-media-1.5.1/distro/archlinux/mate-media.install mate-media/distro/archlinux/mate-media.install
+--- mate-media-1.5.1/distro/archlinux/mate-media.install 1969-12-31 16:00:00.000000000 -0800
++++ mate-media/distro/archlinux/mate-media.install 2012-12-10 21:13:27.115489274 -0800
+@@ -0,0 +1,22 @@
++pkgname=mate-media
++
++post_install() {
++ usr/sbin/mateconfpkg --install ${pkgname}
++ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
++}
++
++pre_upgrade() {
++ pre_remove $1
++}
++
++post_upgrade() {
++ post_install $1
++}
++
++pre_remove() {
++ usr/sbin/mateconfpkg --uninstall ${pkgname}
++}
++
++post_remove() {
++ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
++}
+diff -uNrp mate-media-1.5.1/distro/archlinux/PKGBUILD mate-media/distro/archlinux/PKGBUILD
+--- mate-media-1.5.1/distro/archlinux/PKGBUILD 1969-12-31 16:00:00.000000000 -0800
++++ mate-media/distro/archlinux/PKGBUILD 2012-12-10 21:13:27.115489274 -0800
+@@ -0,0 +1,55 @@
++pkgname=mate-media
++pkgver=1.1.0
++pkgrel=1
++pkgdesc="MATE Media Tools"
++arch=(i686 x86_64)
++license=('GPL')
++depends=('gstreamer0.10-base-plugins' 'mate-panel' 'libmatenotify' 'pulseaudio')
++makedepends=('mate-doc-utils' 'pkgconfig' 'mate-settings-daemon' 'intltool' 'mate-icon-theme' 'libpulse')
++groups=('mate-extras')
++options=(!emptydirs !libtool)
++url="http://matsusoft.com.ar/projects"
++install=mate-media.install
++source=(http://sourceforge.net/projects/matede/files/${pkgver}/${pkgname}.tar.gz/download)
++sha256sums=('9a2051c67bfdb9fc9dd2e55a3c0d733b4b230a3ef1d9c0a5bf2aac11ea068189')
++
++build() {
++ cd "${srcdir}/${pkgname}"
++
++ # brute force
++ #mate-doc-prepare --force --copy
++ #automake
++ #autoconf
++ #autoreconf -i --force
++ #aclocal
++ #intltoolize --automake --copy --force
++ #automake --add-missing
++
++ # Optional Features:
++ # --enable-pulseaudio Enable PulseAudio support [default=auto]
++ # --enable-profiles enable mate media profiles
++ # --enable-grecord enable mate sound recorder
++ # --enable-gstprops enable gstreamer properties
++ # --enable-gstmix enable gstreamer mixer
++ ./configure --prefix=/usr --sysconfdir=/etc \
++ --libexecdir=/usr/lib/${pkgname} \
++ --localstatedir=/var --disable-static \
++ --disable-schemas-install \
++ --disable-scrollkeeper \
++ --enable-pulseaudio \
++ --enable-profiles --enable-grecord \
++ --enable-gstprops --enable-gstmix || return 1
++
++ make || return 1
++}
++
++package() {
++ cd "${srcdir}/${pkgname}"
++
++ make MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
++ #rm -f ${pkgdir}/usr/lib/*.la # can be used options=(!libtools)
++
++ install -m755 -d "${pkgdir}/usr/share/mateconf/schemas"
++ mateconf-merge-schema "${pkgdir}/usr/share/mateconf/schemas/${pkgname}.schemas" --domain ${pkgname} ${pkgdir}/etc/mateconf/schemas/*.schemas || return 1
++ rm -f ${pkgdir}/etc/mateconf/schemas/*.schemas
++}
+diff -uNrp mate-media-1.5.1/gst-mixer/mate-volume-control.desktop.in.in mate-media/gst-mixer/mate-volume-control.desktop.in.in
+--- mate-media-1.5.1/gst-mixer/mate-volume-control.desktop.in.in 2012-12-09 07:07:08.000000000 -0800
++++ mate-media/gst-mixer/mate-volume-control.desktop.in.in 2012-12-10 21:13:27.128491087 -0800
+@@ -7,7 +7,7 @@ StartupNotify=true
+ X-Info=Mate Mixer
+ Terminal=false
+ Type=Application
+-Categories=MATE;GTK;AudioVideo;Settings;HardwareSettings;
++Categories=GTK;Settings;HardwareSettings;
+ X-MATE-DocPath=gst-mixer/mate-volume-control.xml
+ X-MATE-Bugzilla-Bugzilla=MATE
+ X-MATE-Bugzilla-Product=mate-media
+diff -uNrp mate-media-1.5.1/mate-volume-control/data/mate-volume-control-applet.desktop.in mate-media/mate-volume-control/data/mate-volume-control-applet.desktop.in
+--- mate-media-1.5.1/mate-volume-control/data/mate-volume-control-applet.desktop.in 2012-12-09 07:07:08.000000000 -0800
++++ mate-media/mate-volume-control/data/mate-volume-control-applet.desktop.in 2012-12-10 21:13:27.140492762 -0800
+@@ -5,7 +5,7 @@ Icon=multimedia-volume-control
+ Exec=mate-volume-control-applet
+ Terminal=false
+ Type=Application
+-Categories=
++Categories=GTK;Settings;HardwareSettings;
+ NoDisplay=true
+ OnlyShowIn=MATE;XFCE;
+ X-MATE-Bugzilla-Bugzilla=MATE
+diff -uNrp mate-media-1.5.1/sound-theme/Makefile.am mate-media/sound-theme/Makefile.am
+--- mate-media-1.5.1/sound-theme/Makefile.am 2012-12-09 07:07:08.000000000 -0800
++++ mate-media/sound-theme/Makefile.am 2012-12-10 21:13:27.178498065 -0800
+@@ -20,7 +20,7 @@ libsoundtheme_la_SOURCES = \
+ $(NULL)
+
+ libsoundtheme_la_LIBADD = $(SOUND_THEME_LIBS)
+-libsoundtheme_la_LDFLAGS = -no-undefined
++libsoundtheme_la_LDFLAGS = -lm
+
+ BUILT_SOURCES = \
+ $(NULL)
diff --git a/mate-media.spec b/mate-media.spec
index 90a9088..cb23b21 100644
--- a/mate-media.spec
+++ b/mate-media.spec
@@ -1,5 +1,5 @@
Name: mate-media
-Version: 1.5.0
+Version: 1.5.1
Release: 1%{?dist}
Summary: MATE media programs
@@ -14,15 +14,19 @@ BuildRequires: pkgconfig(mate-default-applications)
BuildRequires: pkgconfig(unique-1.0)
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(libcanberra)
-BuildRequires: glade3-libgladeui-devel
BuildRequires: pkgconfig(libpulse)
BuildRequires: mate-doc-utils
BuildRequires: rarian-compat
BuildRequires: mate-common
BuildRequires: desktop-file-utils
+BuildRequires: pulseaudio-libs-devel
Obsoletes: %{name}-devel < 1.4.0-4
+#fix gstreamer applet
+#https://github.com/mate-desktop/mate-media/pull/14
+Patch0: commits_rollup.patch
+
%description
This package contains a few media utilities for the MATE desktop,
including a volume control.
@@ -30,6 +34,7 @@ including a volume control.
%prep
%setup -q
+%patch0 -p1 -b .commit_rollup.patch
NOCONFIGURE=1 ./autogen.sh
%build
@@ -37,34 +42,39 @@ export LDFLAGS="-lm"
%configure \
--disable-static \
--enable-gstmix \
- --disable-scrollkeeper
+ --disable-schemas-compile \
+ --disable-scrollkeeper \
+ --enable-gstmix \
+ --enable-gst-mixer-applet \
+ --enable-pulseaudio \
+ --with-gnu-ld
-# remove unused-direct-shlib-dependency warnings
-sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
make V=1 %{?_smp_mflags}
%install
-make install DESTDIR=$RPM_BUILD_ROOT
-
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
-find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
+make DESTDIR=%{buildroot} install
+find %{buildroot} -name '*.la' -exec rm -rf {} ';'
+find %{buildroot} -name '*.a' -exec rm -rf {} ';'
-desktop-file-install --vendor "" --delete-original \
- --remove-category=MATE \
- --add-category=X-Mate \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- $RPM_BUILD_ROOT%{_datadir}/applications/mate-volume-control.desktop
+desktop-file-install \
+ --remove-category="MATE" \
+ --add-category="X-Mate" \
+ --delete-original \
+ --dir=%{buildroot}%{_datadir}/applications \
+%{buildroot}%{_datadir}/applications/mate-volume-control.desktop
-%find_lang %{name}
+%find_lang %{name} --all-name
%post
/sbin/ldconfig
/bin/touch --no-create %{_datadir}/icons/mate &>/dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
%postun
/sbin/ldconfig
+/usr/bin/update-desktop-database &> /dev/null || :
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/mate &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/mate &>/dev/null || :
@@ -86,11 +96,24 @@ fi
%{_datadir}/sounds/mate/
%{_datadir}/glib-2.0/schemas/org.mate.volume-control.gschema.xml
%{_datadir}/applications/mate-volume-control.desktop
-%{_datadir}/mate/help/mate-volume-control/
-%{_datadir}/omf/mate-volume-control/
-
+%{_datadir}/mate/help/mate-volume-control
+%{_datadir}/omf/mate-volume-control
+%{_libexecdir}/mixer_applet2
+%{_datadir}/dbus-1/services/org.mate.panel.applet.MixerAppletFactory.service
+%{_datadir}/glib-2.0/schemas/org.mate.panel.applet.mixer.gschema.xml
+%{_datadir}/mate-2.0/ui/mixer-applet-menu.xml
+%{_datadir}/mate-panel/applets/org.mate.applets.MixerApplet.mate-panel-applet
+%{_datadir}/mate/help/mate-mixer_applet2
+%{_datadir}/omf/mate-mixer_applet2
%changelog
+* Mon Dec 10 2012 Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.1-1
+- Bump to latest upstream version
+- Add patch to fix compilation errors for gstreamer applet
+- Clean up spec file
+- Add update-desktop-database scriptlet
+- Switch to buildroot macro
+
* Thu Nov 08 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.0-1
- update to 1.5.0 release
- drop devel sub-package and obsolete it
diff --git a/sources b/sources
index e100eb2..b20f632 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-31d15f8552d2cb7c19fcddffff9e6705 mate-media-1.5.0.tar.xz
+590e6b65c46266235271ac957694f844 mate-media-1.5.1.tar.xz
More information about the scm-commits
mailing list