[mate-media/f18] remove duplicate configure flags, update patch
Dan Mashal
vicodan at fedoraproject.org
Tue Dec 11 13:10:06 UTC 2012
commit 80f8e788facba5fe89473127675ce9a94d9dded9
Author: Dan Mashal <dan.mashal at gmail.com>
Date: Tue Dec 11 05:09:38 2012 -0800
remove duplicate configure flags, update patch
commits_rollup.patch | 301 +++++++++++++-------------------------------------
mate-media.spec | 10 +-
2 files changed, 85 insertions(+), 226 deletions(-)
---
diff --git a/commits_rollup.patch b/commits_rollup.patch
index ace0a8f..a6e6c0e 100644
--- a/commits_rollup.patch
+++ b/commits_rollup.patch
@@ -1,240 +1,97 @@
-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
+diff -uNrp a/COPYING.gst-mixer b/COPYING.gst-mixer
+--- a/COPYING.gst-mixer 2012-12-11 05:02:37.496381416 -0800
++++ b/COPYING.gst-mixer 2012-12-11 05:04:28.840786201 -0800
+@@ -51,7 +51,7 @@ library. If the library is modified by
+ want its recipients to know that what they have is not the original
+ version, so that any problems introduced by others will not reflect on
+ the original authors' reputations.
+-
++
+ Finally, any free program is threatened constantly by software
+ patents. We wish to avoid the danger that companies distributing free
+ software will individually obtain patent licenses, thus in effect
+@@ -98,7 +98,7 @@ works together with the library.
- The precise terms and conditions for copying, distribution and
- modification follow.
+ Note that it is possible for a library to be covered by the ordinary
+ General Public License rather than by this special one.
-
-- GNU GENERAL PUBLIC LICENSE
+
-+ GNU GENERAL PUBLIC LICENSE
+ GNU LIBRARY 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.)
+@@ -145,7 +145,7 @@ Library.
+ You may charge a fee for the physical act of transferring a copy,
+ and you may at your option offer warranty protection in exchange for a
+ fee.
-
+
- 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.
+ 2. You may modify your copy or copies of the Library or any portion
+ of it, thus forming a work based on the Library, and copy and
+ distribute such modifications or work under the terms of Section 1
+@@ -203,7 +203,7 @@ instead of to this License. (If a newer
+ ordinary GNU General Public License has appeared, then you can specify
+ that version instead if you wish.) Do not make any other change in
+ these notices.
-
+
- 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.
+ Once this change is made in a given copy, it is irreversible for
+ that copy, so the ordinary GNU General Public License applies to all
+ subsequent copies and derivative works made from that copy.
+@@ -254,7 +254,7 @@ Library will still fall under Section 6.
+ distribute the object code for the work under the terms of Section 6.
+ Any executables containing that work also fall under Section 6,
+ whether or not they are linked directly with the Library itself.
-
+
- 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
+ 6. As an exception to the Sections above, you may also compile or
+ link a "work that uses the Library" with the Library to produce a
+ work containing portions of the Library, and distribute that work
+@@ -308,7 +308,7 @@ restrictions of other proprietary librar
+ accompany the operating system. Such a contradiction means you cannot
+ use both them and the Library together in an executable that you
+ distribute.
-
-- 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
-+}
+ 7. You may place library facilities that are a work based on the
+ Library side-by-side in a single library together with other library
+ facilities not covered by this License, and distribute such a combined
+@@ -349,7 +349,7 @@ subject to these terms and conditions.
+ restrictions on the recipients' exercise of the rights granted herein.
+ You are not responsible for enforcing compliance by third parties to
+ this License.
+-
+
-+package() {
-+ cd "${srcdir}/${pkgname}"
+ 11. If, as a consequence of a court judgment or allegation of patent
+ infringement or for any other reason (not limited to patent issues),
+ conditions are imposed on you (whether by court order, agreement or
+@@ -401,7 +401,7 @@ conditions either of that version or of
+ the Free Software Foundation. If the Library does not specify a
+ license version number, you may choose any version ever published by
+ the Free Software Foundation.
+-
+
-+ make MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
-+ #rm -f ${pkgdir}/usr/lib/*.la # can be used options=(!libtools)
+ 14. If you wish to incorporate parts of the Library into other free
+ programs whose distribution conditions are incompatible with these,
+ write to the author to ask for permission. For software which is
+@@ -435,7 +435,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVI
+ DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+-
+
-+ 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)
+ Appendix: How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+diff -uNrp a/gst-mixer/src/Makefile.am b/gst-mixer/src/Makefile.am
+--- a/gst-mixer/src/Makefile.am 2012-12-11 05:02:37.514383912 -0800
++++ b/gst-mixer/src/Makefile.am 2012-12-11 05:03:15.795672108 -0800
+@@ -37,7 +37,8 @@ noinst_HEADERS = \
+
+ mate_volume_control_LDFLAGS = \
+ $(GVC_ST_LIBS) \
+- $(GSTMIXER_LIBS)
++ $(GSTMIXER_LIBS) \
++ -lm
- libsoundtheme_la_LIBADD = $(SOUND_THEME_LIBS)
--libsoundtheme_la_LDFLAGS = -no-undefined
-+libsoundtheme_la_LDFLAGS = -lm
- BUILT_SOURCES = \
- $(NULL)
+ -include $(top_srcdir)/git.mk
diff --git a/mate-media.spec b/mate-media.spec
index d4fa60e..716ea66 100644
--- a/mate-media.spec
+++ b/mate-media.spec
@@ -1,6 +1,6 @@
Name: mate-media
Version: 1.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: MATE media programs
License: GPLv2+ and LGPLv2+
@@ -29,7 +29,7 @@ Requires(postun): desktop-file-utils
Obsoletes: %{name}-devel < 1.4.0-4
#fix gstreamer applet
-#https://github.com/mate-desktop/mate-media/pull/14
+#https://github.com/mate-desktop/mate-media/pull/15
Patch0: commits_rollup.patch
%description
@@ -43,13 +43,11 @@ including a volume control.
NOCONFIGURE=1 ./autogen.sh
%build
-export LDFLAGS="-lm"
%configure \
--disable-static \
--enable-gstmix \
--disable-schemas-compile \
--disable-scrollkeeper \
- --enable-gstmix \
--enable-gst-mixer-applet \
--enable-pulseaudio \
--with-gnu-ld
@@ -112,6 +110,10 @@ fi
%{_datadir}/omf/mate-mixer_applet2
%changelog
+* Tue Dec 11 2012 Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.1-2
+- Remove duplicate configure flag
+- Fix gstreamer applet compilation error the right way
+
* 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
More information about the scm-commits
mailing list