From 4f3f062702c4761a02478460969590976c64f5e0 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Jul 11 2006 16:57:07 +0000 Subject: Update easytag to the gtk2 branch (#188600). --- diff --git a/.cvsignore b/.cvsignore index e0894a4..baa8ba4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -easytag-1.1.tar.bz2 +easytag-1.99.12-patched.tar.bz2 diff --git a/easytag-1.99.12-id3lib.patch b/easytag-1.99.12-id3lib.patch new file mode 100644 index 0000000..acc270b --- /dev/null +++ b/easytag-1.99.12-id3lib.patch @@ -0,0 +1,123 @@ +diff -Naupr easytag-1.99.12.orig/configure easytag-1.99.12/configure +--- easytag-1.99.12.orig/configure 2005-12-15 20:53:37.000000000 +0100 ++++ easytag-1.99.12/configure 2006-07-11 18:47:40.000000000 +0200 +@@ -24397,7 +24397,7 @@ echo "${ECHO_T}$LINGUAS" >&6 + + + +- ac_config_files="$ac_config_files Makefile easytag.spec doc/easytag.1 src/Makefile src/id3lib/Makefile src/libapetag/Makefile src/libmpg123/Makefile po/Makefile.in" ++ ac_config_files="$ac_config_files Makefile easytag.spec doc/easytag.1 src/Makefile src/id3lib/Makefile src/libapetag/Makefile po/Makefile.in" + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure + # tests run on this system so they can be shared between configure +@@ -24968,7 +24968,6 @@ do + "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "src/id3lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/id3lib/Makefile" ;; + "src/libapetag/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libapetag/Makefile" ;; +- "src/libmpg123/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libmpg123/Makefile" ;; + "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; + "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; +diff -Naupr easytag-1.99.12.orig/configure.in easytag-1.99.12/configure.in +--- easytag-1.99.12.orig/configure.in 2005-12-15 20:50:49.000000000 +0100 ++++ easytag-1.99.12/configure.in 2006-07-11 18:47:22.000000000 +0200 +@@ -318,7 +318,6 @@ AC_OUTPUT([ Makefile + src/Makefile + src/id3lib/Makefile + src/libapetag/Makefile +- src/libmpg123/Makefile + po/Makefile.in + ]) + +diff -Naupr easytag-1.99.12.orig/src/Makefile.am easytag-1.99.12/src/Makefile.am +--- easytag-1.99.12.orig/src/Makefile.am 2005-11-28 00:57:02.000000000 +0100 ++++ easytag-1.99.12/src/Makefile.am 2006-07-11 18:47:04.000000000 +0200 +@@ -1,6 +1,6 @@ + CFLAGS = @CFLAGS@ @GTK_CFLAGS@ + +-SUBDIRS = libmpg123 libapetag id3lib ++SUBDIRS = libapetag id3lib + + bin_PROGRAMS = easytag + +@@ -70,7 +70,7 @@ EXTRA_DIST = \ + win32/win32dep.h \ + win32/win_easytag.c + +-easytag_LDADD = $(GTK_LIBS) libmpg123/libmpg123.a libapetag/libapetag.a id3lib/libid3bugfix.a ++easytag_LDADD = $(GTK_LIBS) libapetag/libapetag.a id3lib/libid3bugfix.a + + localedir = $(datadir)/locale + PACKAGE_DATA_DIR = $(datadir)/$(PACKAGE) +diff -Naupr easytag-1.99.12.orig/src/Makefile.in easytag-1.99.12/src/Makefile.in +--- easytag-1.99.12.orig/src/Makefile.in 2005-12-15 20:53:34.000000000 +0100 ++++ easytag-1.99.12/src/Makefile.in 2006-07-11 18:47:04.000000000 +0200 +@@ -63,7 +63,7 @@ am_easytag_OBJECTS = about.$(OBJEXT) ape + vcedit.$(OBJEXT) + easytag_OBJECTS = $(am_easytag_OBJECTS) + am__DEPENDENCIES_1 = +-easytag_DEPENDENCIES = $(am__DEPENDENCIES_1) libmpg123/libmpg123.a \ ++easytag_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + libapetag/libapetag.a id3lib/libid3bugfix.a + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp +@@ -211,7 +211,7 @@ sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-SUBDIRS = libmpg123 libapetag id3lib ++SUBDIRS = libapetag id3lib + easytag_SOURCES = \ + about.c \ + about.h \ +@@ -278,7 +278,7 @@ EXTRA_DIST = \ + win32/win32dep.h \ + win32/win_easytag.c + +-easytag_LDADD = $(GTK_LIBS) libmpg123/libmpg123.a libapetag/libapetag.a id3lib/libid3bugfix.a ++easytag_LDADD = $(GTK_LIBS) libapetag/libapetag.a id3lib/libid3bugfix.a + localedir = $(datadir)/locale + PACKAGE_DATA_DIR = $(datadir)/$(PACKAGE) + INCLUDES = -DLOCALE=\"$(localedir)\" -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" +diff -Naupr easytag-1.99.12.orig/src/Makefile.mingw easytag-1.99.12/src/Makefile.mingw +--- easytag-1.99.12.orig/src/Makefile.mingw 2006-03-02 00:13:48.000000000 +0100 ++++ easytag-1.99.12/src/Makefile.mingw 2006-07-11 18:47:04.000000000 +0200 +@@ -79,13 +79,6 @@ DLL_C_SRC = about.c \ + libapetag/info_mac.c \ + libapetag/info_mpc.c \ + libapetag/is_tag.c \ +- libmpg123/common.c \ +- libmpg123/dxhead.c \ +- libmpg123/getbits.c \ +- libmpg123/layer1.c \ +- libmpg123/layer2.c \ +- libmpg123/layer3.c \ +- libmpg123/mpg123.c \ + misc.c \ + monkeyaudio_header.c \ + mp4_header.c \ +diff -Naupr easytag-1.99.12.orig/src/mpeg_header.c easytag-1.99.12/src/mpeg_header.c +--- easytag-1.99.12.orig/src/mpeg_header.c 2005-10-19 23:30:50.000000000 +0200 ++++ easytag-1.99.12/src/mpeg_header.c 2006-07-11 18:47:04.000000000 +0200 +@@ -31,10 +31,9 @@ + #include "et_core.h" + #include "misc.h" + #include "charset.h" +-#include "libmpg123/mpg123.h" + +-//#include +-//#include "id3lib/id3_bugfix.h" ++#include ++#include "id3lib/id3_bugfix.h" + + + +@@ -82,7 +81,7 @@ static gchar* channel_mode_name(int mode + */ + gboolean Mpeg_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo) + { +-#if (1) ++#if (0) + FILE *file; + gulong filesize; + diff --git a/easytag.spec b/easytag.spec index cd01d46..d28a0d4 100644 --- a/easytag.spec +++ b/easytag.spec @@ -1,13 +1,19 @@ Summary: Tag editor for mp3, ogg, flac and other music files Name: easytag -Version: 1.1 -Release: 3%{?dist} +Version: 1.99.12 +Release: 2%{?dist} License: GPL Group: Applications/Multimedia URL: http://easytag.sourceforge.net/ -Source: http://dl.sf.net/easytag/easytag-%{version}.tar.bz2 +# Remove code potentially able to decode mp3 +#Source: http://dl.sf.net/easytag/easytag-%{version}.tar.bz2 +# tar xjvf easytag-$VERSION.tar.bz2 +# rm -rf easytag-$VERSION/src/libmpg123/ +# tar --numeric-owner -cjvf easytag-$VERSION-patched.tar.bz2 easytag-$VERSION +Source: easytag-%{version}-patched.tar.bz2 +Patch0: easytag-1.99.12-id3lib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gtk+-devel >= 1.2.7, id3lib-devel >= 3.7.12 +BuildRequires: gtk2-devel >= 2.4.0, id3lib-devel >= 3.7.12 BuildRequires: libvorbis-devel >= 1.0, flac-devel, gettext %description @@ -17,6 +23,7 @@ MP2, FLAC, Ogg Vorbis, MusePack and Monkey's Audio files. %prep %setup +%patch -p1 -b .id3lib %build @@ -36,96 +43,97 @@ MP2, FLAC, Ogg Vorbis, MusePack and Monkey's Audio files. %files -f %{name}.lang %defattr(-, root, root, 0755) -%doc COPYING ChangeLog README TODO THANKS USERS-GUIDE +%doc ChangeLog COPYING README THANKS TODO USERS-GUIDE %{_bindir}/easytag -%{_datadir}/applications/easytag.desktop +%{_datadir}/applications/*easytag.desktop %{_datadir}/easytag/ %{_datadir}/pixmaps/* %{_mandir}/man?/* %changelog -* Mon Mar 6 2006 Matthias Saou 1.1-3 -- FC5 rebuild. +* Tue Jul 11 2006 Matthias Saou 1.99.12-2 +- Now use "patched" tarball with the libmpg123 directory removed. +- Include patch to disable libmpg123 and use id3lib instead for mpeg headers. -* Wed Feb 8 2006 Matthias Saou 1.1-2 -- Rebuild for new gcc/glibc. +* Tue Apr 11 2006 Matthias Saou 1.99.12-1 +- Update to 1.99.12. -* Fri Apr 8 2005 Matthias Saou 1.1-1 -- Update to 1.1. -- Remove yesterday's gcc4 patch, as it's no longer needed. +* Fri Mar 17 2006 Matthias Saou 1.99.11-2 +- Release bump to drop the disttag number in FC5 build. -* Thu Apr 7 2005 Matthias Saou 1.0-4 -- Patch to fix gcc4 build issues (#112759 - Michael Schwendt). +* Fri Dec 16 2005 Matthias Saou 1.99.11-1 +- Update to 1.99.11. -* Wed Mar 30 2005 Matthias Saou 1.0-3 -- Update again to 1.0. -- Remove desktop file patch, the original is now UTF-8. +* Tue Dec 13 2005 Matthias Saou 1.99.10-1 +- Update to 1.99.10. -* Fri Dec 10 2004 Michael Schwendt - 0.31-1 -- Downgrade version again until somebody really updates the - entire package contents. +* Thu Nov 3 2005 Matthias Saou 1.99.9-1 +- Update to 1.99.9. -* Wed Nov 10 2004 Matthias Saou 1.0-2 -- Update to 1.0. -- Bump release to provide Extras upgrade path. +* Mon Oct 10 2005 Matthias Saou 1.99.8-1 +- Update to 1.99.8. +- Try to add MP4/AAC support, but with current faad2 it fails to compile. -* Wed Jun 2 2004 Marius L. Jøhndal - 0:0.31-0.fdr.1 -- Updated to 0.31. +* Fri Oct 29 2004 Matthias Saou 1.99.1-1 +- Fork off to "unstable" 1.99.1. -* Mon Mar 29 2004 Marius L. Jøhndal - 0:0.30.2-0.fdr.1 -- Updated to 0.30.2. -- Converted spec file to UTF-8. +* Tue Jun 1 2004 Matthias Saou 0.31-1 +- Update to stable 0.31. -* Wed Oct 29 2003 Marius L. Jøhndal 0:0.30-0.fdr.2.c -- Patched to 0.30c. +* Fri Mar 26 2004 Matthias Saou 0.30.2-1 +- Update to unstable 0.30.2. -* Mon Sep 8 2003 Marius L. Jøhndal 0:0.30-0.fdr.1 -- Updated to 0.30. +* Wed Mar 24 2004 Matthias Saou 0.30.1-1 +- Update to unstable 0.30.1. +- Remove desktop-file-install as it's now freedesktop style. -* Wed Sep 3 2003 Marius L. Jøhndal 0:0.29-0.fdr.1 -- Updated to 0.29. -- Minor rephrasing of the package description. +* Thu Feb 26 2004 Matthias Saou 0.30-4d +- Added patch for 0.30d. -* Sun Jun 1 2003 Marius Jøhndal 0:0.28-0.fdr.1 -- Updated to 0.28. +* Fri Nov 7 2003 Matthias Saou 0.30-3c +- Rebuild for Fedora Core 1. -* Sat May 24 2003 Marius Jøhndal 0:0.27-0.fdr.3.a -- Removed version from BuildRequires: gtk+-devel (RH 7.0 and newer ship with - gtk+-devel >= 1.2.8). +* Thu Oct 30 2003 Matthias Saou 0.30-2c +- Added patches to update to 0.30c. -* Mon May 19 2003 Marius Jøhndal 0:0.27-0.fdr.2.a -- Use "--vendor fedora" instead of "--vendor Fedora" for desktop-file-install. -- Touch all files instead of letting autotools update files unneccesarily. +* Tue Sep 9 2003 Matthias Saou +- Update to 0.30. -* Sun May 11 2003 Marius Jøhndal 0:0.27-0.fdr.1.a -- Initial Fedora RPM. +* Mon Sep 1 2003 Matthias Saou +- Update to 0.29. -* Mon Mar 31 2003 Matthias Saou +* Tue Jul 15 2003 Matthias Saou +- Update to 0.28.1. + +* Wed Jun 4 2003 Matthias Saou +- Update to 0.28. + +* Mon Mar 31 2003 Matthias Saou - Rebuilt for Red Hat Linux 9. -* Thu Mar 20 2003 Matthias Saou +* Thu Mar 20 2003 Matthias Saou - Added patch to 0.27a. -* Fri Feb 7 2003 Matthias Saou +* Fri Feb 7 2003 Matthias Saou - Update to 0.27. -* Fri Jan 3 2003 Ville Skyttä - 0.26-fr1 +* Fri Jan 3 2003 Ville Skyttä 0.26-fr1 - Update to 0.26. -* Wed Dec 25 2002 Ville Skyttä - 0.25b-fr1 +* Wed Dec 25 2002 Ville Skyttä 0.25b-fr1 - Update to 0.25b. - Build with flac support. -* Thu Oct 10 2002 Matthias Saou +* Thu Oct 10 2002 Matthias Saou - Rebuilt for Red Hat Linux 8.0. - New menu entry. - Rebuild with flac support... nope, doesn't compile :-( -* Fri Sep 20 2002 Matthias Saou +* Fri Sep 20 2002 Matthias Saou - Update to 0.24. -* Fri Aug 30 2002 Matthias Saou +* Fri Aug 30 2002 Matthias Saou - Spec file cleanup for Red Hat Linux. - A few %%files fixes and improvements. diff --git a/sources b/sources index be05904..08b7941 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c334c286f649a12e6bd0d3a4e4ac60c4 easytag-1.1.tar.bz2 +a152cbea00d1fde55d89c59c63602470 easytag-1.99.12-patched.tar.bz2