From b22e33af69c9d6384155e954d7640a49ec2e8112 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Dec 12 2006 12:53:21 +0000 Subject: Update to 1.99.13. --- diff --git a/.cvsignore b/.cvsignore index baa8ba4..ae29fb1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -easytag-1.99.12-patched.tar.bz2 +easytag-1.99.13-patched.tar.bz2 diff --git a/easytag-1.99.12-id3lib.patch b/easytag-1.99.12-id3lib.patch deleted file mode 100644 index acc270b..0000000 --- a/easytag-1.99.12-id3lib.patch +++ /dev/null @@ -1,123 +0,0 @@ -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-1.99.13-id3lib.patch b/easytag-1.99.13-id3lib.patch new file mode 100644 index 0000000..7736a71 --- /dev/null +++ b/easytag-1.99.13-id3lib.patch @@ -0,0 +1,110 @@ +diff -Naupr easytag-1.99.13.orig/configure easytag-1.99.13/configure +--- easytag-1.99.13.orig/configure 2006-05-22 18:23:56.000000000 +0200 ++++ easytag-1.99.13/configure 2006-12-12 11:53:20.000000000 +0100 +@@ -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.13.orig/configure.in easytag-1.99.13/configure.in +--- easytag-1.99.13.orig/configure.in 2006-05-22 18:23:39.000000000 +0200 ++++ easytag-1.99.13/configure.in 2006-12-12 11:53:30.000000000 +0100 +@@ -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.13.orig/src/Makefile.am easytag-1.99.13/src/Makefile.am +--- easytag-1.99.13.orig/src/Makefile.am 2005-11-28 00:57:02.000000000 +0100 ++++ easytag-1.99.13/src/Makefile.am 2006-12-12 11:53:45.000000000 +0100 +@@ -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.13.orig/src/Makefile.in easytag-1.99.13/src/Makefile.in +--- easytag-1.99.13.orig/src/Makefile.in 2006-12-10 22:39:58.000000000 +0100 ++++ easytag-1.99.13/src/Makefile.in 2006-12-12 11:54:12.000000000 +0100 +@@ -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.13.orig/src/Makefile.mingw easytag-1.99.13/src/Makefile.mingw +--- easytag-1.99.13.orig/src/Makefile.mingw 2006-03-02 00:13:48.000000000 +0100 ++++ easytag-1.99.13/src/Makefile.mingw 2006-12-12 11:54:27.000000000 +0100 +@@ -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.13.orig/src/mpeg_header.c easytag-1.99.13/src/mpeg_header.c +--- easytag-1.99.13.orig/src/mpeg_header.c 2006-12-06 22:08:56.000000000 +0100 ++++ easytag-1.99.13/src/mpeg_header.c 2006-12-12 11:55:06.000000000 +0100 +@@ -35,7 +35,7 @@ + // Set to : + // - 1 to use ID3lib for reading headers + // - 0 to use mpeg123 for reading headers +-#define USE_ID3LIB_4_HEADER 0 ++#define USE_ID3LIB_4_HEADER 1 + + #if USE_ID3LIB_4_HEADER + # include diff --git a/easytag.spec b/easytag.spec index e122bc6..06fde8b 100644 --- a/easytag.spec +++ b/easytag.spec @@ -1,7 +1,7 @@ Summary: Tag editor for mp3, ogg, flac and other music files Name: easytag -Version: 1.99.12 -Release: 3%{?dist} +Version: 1.99.13 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://easytag.sourceforge.net/ @@ -11,10 +11,12 @@ URL: http://easytag.sourceforge.net/ # 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 +Patch0: easytag-1.99.13-id3lib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gtk2-devel >= 2.4.0, id3lib-devel >= 3.7.12 BuildRequires: libvorbis-devel >= 1.0, flac-devel, gettext +# Not in Extras (yet, #191036 - enable later!) +#Buildrequires: libmp4v2-devel %description EasyTAG is a utility for viewing, editing and writing the tags of MP3, @@ -33,7 +35,7 @@ MP2, FLAC, Ogg Vorbis, MusePack and Monkey's Audio files. %install %{__rm} -rf %{buildroot} -%makeinstall +%{__make} install DESTDIR=%{buildroot} %find_lang %{name} @@ -52,6 +54,11 @@ MP2, FLAC, Ogg Vorbis, MusePack and Monkey's Audio files. %changelog +* Tue Dec 12 2006 Matthias Saou 1.99.13-1 +- Update to 1.99.13. +- Update id3lib patch to still apply. +- Switch away from %%makeinstall to DESTDIR method. + * Mon Aug 28 2006 Matthias Saou 1.99.12-3 - FC6 rebuild. diff --git a/sources b/sources index 08b7941..f876ed7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a152cbea00d1fde55d89c59c63602470 easytag-1.99.12-patched.tar.bz2 +3cda85580b95b8bcb4e29bd743704037 easytag-1.99.13-patched.tar.bz2