rpms/easytag/devel easytag-1.99.13-id3lib.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 easytag.spec, 1.14, 1.15 sources, 1.5, 1.6 easytag-1.99.12-id3lib.patch, 1.1, NONE

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/easytag/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9951/devel

Modified Files:
	.cvsignore easytag.spec sources 
Added Files:
	easytag-1.99.13-id3lib.patch 
Removed Files:
	easytag-1.99.12-id3lib.patch 
Log Message:
Update to 1.99.13.


easytag-1.99.13-id3lib.patch:

--- NEW FILE easytag-1.99.13-id3lib.patch ---
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 <id3.h>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/easytag/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Jul 2006 16:57:07 -0000	1.5
+++ .cvsignore	12 Dec 2006 12:53:21 -0000	1.6
@@ -1 +1 @@
-easytag-1.99.12-patched.tar.bz2
+easytag-1.99.13-patched.tar.bz2


Index: easytag.spec
===================================================================
RCS file: /cvs/extras/rpms/easytag/devel/easytag.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- easytag.spec	28 Aug 2006 09:21:11 -0000	1.14
+++ easytag.spec	12 Dec 2006 12:53:21 -0000	1.15
@@ -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 @@
 # 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 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR=%{buildroot}
 %find_lang %{name}
 
 
@@ -52,6 +54,11 @@
 
 
 %changelog
+* Tue Dec 12 2006 Matthias Saou <http://freshrpms.net/> 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 <http://freshrpms.net/> 1.99.12-3
 - FC6 rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/easytag/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Jul 2006 16:57:07 -0000	1.5
+++ sources	12 Dec 2006 12:53:21 -0000	1.6
@@ -1 +1 @@
-a152cbea00d1fde55d89c59c63602470  easytag-1.99.12-patched.tar.bz2
+3cda85580b95b8bcb4e29bd743704037  easytag-1.99.13-patched.tar.bz2


--- easytag-1.99.12-id3lib.patch DELETED ---