rpms/audacious/devel audacious-1.1.0-amidi-backend.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 audacious-1.1.0-no-rpath.patch, 1.1, 1.2 audacious-1.1.0-quoting.patch, 1.1, 1.2 audacious-1.1.0-relative-links.patch, 1.1, 1.2 audacious.spec, 1.1, 1.2 sources, 1.2, 1.3
Ralf Ertzinger (ertzing)
fedora-extras-commits at redhat.com
Fri Jul 21 19:42:00 UTC 2006
Author: ertzing
Update of /cvs/extras/rpms/audacious/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29160
Modified Files:
.cvsignore audacious-1.1.0-no-rpath.patch
audacious-1.1.0-quoting.patch
audacious-1.1.0-relative-links.patch audacious.spec sources
Added Files:
audacious-1.1.0-amidi-backend.patch
Log Message:
Upgrade to upstream 1.1.0, patch file rediffs
audacious-1.1.0-amidi-backend.patch:
--- NEW FILE audacious-1.1.0-amidi-backend.patch ---
diff -uNr audacious-fedora-1.1.0-orig/configure audacious-fedora-1.1.0/configure
--- audacious-fedora-1.1.0-orig/configure 2006-07-21 19:18:05.000000000 +0200
+++ audacious-fedora-1.1.0/configure 2006-07-21 21:08:29.000000000 +0200
@@ -15045,7 +15045,7 @@
{ (exit 1); exit 1; }; }
fi
- AMIDIPLUGDATADIR=${datadir}/amidi-plug/audacious
+ AMIDIPLUGDATADIR=${libdir}/amidi-plug/audacious
if test "x$enable_amidiplug_alsa" = "xauto" -o "x$enable_amidiplug_alsa" = "xyes"; then
if test "x$alsalib_available" = "xcheck"; then
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 16 Jul 2006 21:11:08 -0000 1.2
+++ .cvsignore 21 Jul 2006 19:41:59 -0000 1.3
@@ -1 +1 @@
-audacious-fedora-1.1.0-dr2.tar.gz
+audacious-fedora-1.1.0.tar.gz
audacious-1.1.0-no-rpath.patch:
Index: audacious-1.1.0-no-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious-1.1.0-no-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audacious-1.1.0-no-rpath.patch 16 Jul 2006 21:11:08 -0000 1.1
+++ audacious-1.1.0-no-rpath.patch 21 Jul 2006 19:41:59 -0000 1.2
@@ -1,9 +1,20 @@
---- audacious-fedora-1.1.0-dr2/audacious/Makefile.in~ 2006-06-29 16:30:55.000000000 +0200
-+++ audacious-fedora-1.1.0-dr2/audacious/Makefile.in 2006-06-29 16:30:55.000000000 +0200
-@@ -101,5 +101,5 @@
+diff -uNr audacious-fedora-1.1.0-orig/audacious/Makefile audacious-fedora-1.1.0/audacious/Makefile
+--- audacious-fedora-1.1.0-orig/audacious/Makefile 2006-07-21 19:18:05.000000000 +0200
++++ audacious-fedora-1.1.0/audacious/Makefile 2006-07-21 20:33:37.000000000 +0200
+@@ -102,5 +102,5 @@
fi;
audacious: $(OBJECTS)
- $(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ -Wl,-rpath,${libdir}
+ $(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@
@printf "%10s %-20s\n" LINK $@
+diff -uNr audacious-fedora-1.1.0-orig/audtool/Makefile audacious-fedora-1.1.0/audtool/Makefile
+--- audacious-fedora-1.1.0-orig/audtool/Makefile 2006-07-21 19:18:05.000000000 +0200
++++ audacious-fedora-1.1.0/audtool/Makefile 2006-07-21 20:33:22.000000000 +0200
+@@ -25,5 +25,5 @@
+ OBJECTS = ${SOURCES:.c=.o}
+
+ audtool: $(OBJECTS)
+- $(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ -Wl,-rpath,${libdir}
++ $(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@
+ @printf "%10s %-20s\n" LINK $@
audacious-1.1.0-quoting.patch:
Index: audacious-1.1.0-quoting.patch
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious-1.1.0-quoting.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audacious-1.1.0-quoting.patch 16 Jul 2006 21:11:08 -0000 1.1
+++ audacious-1.1.0-quoting.patch 21 Jul 2006 19:41:59 -0000 1.2
@@ -69,9 +69,9 @@
options->filenames = g_list_prepend(options->filenames, filename);
}
-diff -uNr audacious-1.1.0-dr2-orig/audacious/Makefile.in audacious-1.1.0-dr2/audacious/Makefile.in
---- audacious-1.1.0-dr2-orig/audacious/Makefile.in 2006-05-28 17:27:54.000000000 +0200
-+++ audacious-1.1.0-dr2/audacious/Makefile.in 2006-07-09 16:53:21.000000000 +0200
+diff -uNr audacious-1.1.0-dr2-orig/audacious/Makefile audacious-1.1.0-dr2/audacious/Makefile
+--- audacious-1.1.0-dr2-orig/audacious/Makefile 2006-05-28 17:27:54.000000000 +0200
++++ audacious-1.1.0-dr2/audacious/Makefile 2006-07-09 16:53:21.000000000 +0200
@@ -18,6 +18,7 @@
CFLAGS += \
$(GTK_CFLAGS) \
audacious-1.1.0-relative-links.patch:
Index: audacious-1.1.0-relative-links.patch
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious-1.1.0-relative-links.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audacious-1.1.0-relative-links.patch 16 Jul 2006 21:11:08 -0000 1.1
+++ audacious-1.1.0-relative-links.patch 21 Jul 2006 19:41:59 -0000 1.2
@@ -1,13 +1,13 @@
-diff -uNr audacious-fedora-1.1.0-dr2-orig/libaudacious/Makefile.in audacious-fedora-1.1.0-dr2/libaudacious/Makefile.in
---- audacious-fedora-1.1.0-dr2-orig/libaudacious/Makefile.in 2006-06-24 18:20:48.000000000 +0200
-+++ audacious-fedora-1.1.0-dr2/libaudacious/Makefile.in 2006-06-29 20:45:03.000000000 +0200
+diff -uNr audacious-fedora-1.1.0-orig/libaudacious/Makefile.in audacious-fedora-1.1.0/libaudacious/Makefile.in
+--- audacious-fedora-1.1.0-orig/libaudacious/Makefile.in 2006-07-21 19:18:05.000000000 +0200
++++ audacious-fedora-1.1.0/libaudacious/Makefile.in 2006-07-21 20:36:07.000000000 +0200
@@ -47,7 +47,7 @@
install-posthook:
- @mv ${DESTDIR}/${LIBDIR}/libaudacious.so ${DESTDIR}/${LIBDIR}/libaudacious.so.2.0.0
-- @ln -sf ${LIBDIR}/libaudacious.so.2.0.0 \
-+ @ln -sf libaudacious.so.2.0.0 \
- ${DESTDIR}/${LIBDIR}/libaudacious.so.2
-- @ln -sf ${LIBDIR}/libaudacious.so.2 \
-+ @ln -sf libaudacious.so.2 \
+ @mv ${DESTDIR}/${LIBDIR}/libaudacious.so ${DESTDIR}/${LIBDIR}/libaudacious.so.3.0.0
+- @ln -sf ${LIBDIR}/libaudacious.so.3.0.0 \
++ @ln -sf libaudacious.so.3.0.0 \
+ ${DESTDIR}/${LIBDIR}/libaudacious.so.3
+- @ln -sf ${LIBDIR}/libaudacious.so.3 \
++ @ln -sf libaudacious.so.3 \
${DESTDIR}/${LIBDIR}/libaudacious.so
Index: audacious.spec
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/audacious.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audacious.spec 16 Jul 2006 21:11:08 -0000 1.1
+++ audacious.spec 21 Jul 2006 19:41:59 -0000 1.2
@@ -1,6 +1,6 @@
Name: audacious
Version: 1.1.0
-Release: 0.2.dr2%{?dist}
+Release: 1%{?dist}
Summary: A GTK2 based media player similar to xmms
Group: Applications/Multimedia
@@ -10,12 +10,13 @@
# with the FE license guidelines. They are removed in the -fedora-
# file.
# Source0: http://audacious-media-player.org/beta/audacious-1.1.0-dr2.tgz
-Source0: audacious-fedora-1.1.0-dr2.tar.gz
+Source0: audacious-fedora-1.1.0.tar.gz
Patch0: audacious-1.1.0-xmms-skins.patch
Patch1: audacious-1.1.0-default-skin.patch
Patch2: audacious-1.1.0-no-rpath.patch
Patch3: audacious-1.1.0-relative-links.patch
Patch4: audacious-1.1.0-quoting.patch
+Patch5: audacious-1.1.0-amidi-backend.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel >= 2.6, esound-devel >= 0.2, libvorbis-devel >= 1.0
@@ -79,7 +80,7 @@
%prep
-%setup -q -n %{name}-fedora-1.1.0-dr2
+%setup -q -n %{name}-fedora-1.1.0
# Read xmms skins directory
%patch0 -p1 -b .xmms-skins
@@ -96,6 +97,9 @@
# Filename quoting
%patch4 -p1 -b .quoting
+# Amidi backends path
+%patch5 -p1 -b .amidi-backend
+
%build
%configure \
@@ -103,6 +107,7 @@
--enable-gconf \
--enable-gnome-vfs \
--enable-amidiplug \
+ --disable-amidiplug-dummy \
--disable-dependency-tracking
make V=1 %{?_smp_mflags}
@@ -154,8 +159,10 @@
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/audacious
+%{_bindir}/audtool
%{_libdir}/*.so.*
%{_libdir}/audacious
+%{_libdir}/amidi-plug
%{_datadir}/audacious
%exclude %{_libdir}/audacious/Output/libjackout.so
%exclude %{_libdir}/audacious/Output/libarts.so
@@ -185,6 +192,10 @@
%changelog
+* Fri Jul 21 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.0-1.fc6
+- Update to 1.1.0 final
+- Rediff some patches
+
* Sun Jul 9 2006 Ralf Ertzinger <ralf at skytale.net> 1.1.0-0.2.dr2.fc6
- Fix quoting of filenames
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/audacious/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 16 Jul 2006 21:11:08 -0000 1.2
+++ sources 21 Jul 2006 19:41:59 -0000 1.3
@@ -1 +1 @@
-01b85f020217e9ad92c8b1a89e2e7976 audacious-fedora-1.1.0-dr2.tar.gz
+848e0a9f777641992c7b5ca76f583e89 audacious-fedora-1.1.0.tar.gz
More information about the fedora-extras-commits
mailing list