[easytag] Update to 2.1.7 and improve icon

Matthias Saou thias at fedoraproject.org
Thu May 17 21:52:42 UTC 2012 

commit a6f810f52b990ad2d11cda8d3fa3755906156fb7
Author: Matthias Saou <matthias at saou.eu>
Date:   Thu May 17 23:52:15 2012 +0200

    Update to 2.1.7 and improve icon

 EasyTAG_icon.png               |  Bin 0 -> 25802 bytes
 easytag-2.1.7-id3lib.patch     |   73 ++++++++++++++++++++++++++++++++++++++++
 easytag-2.1.7-src-id3lib.patch |   46 -------------------------
 easytag.spec                   |   34 ++++++++++---------
 sources                        |    2 +-
 5 files changed, 92 insertions(+), 63 deletions(-)
---
diff --git a/EasyTAG_icon.png b/EasyTAG_icon.png
new file mode 100644
index 0000000..801de05
Binary files /dev/null and b/EasyTAG_icon.png differ
diff --git a/easytag-2.1.7-id3lib.patch b/easytag-2.1.7-id3lib.patch
new file mode 100644
index 0000000..2734842
--- /dev/null
+++ b/easytag-2.1.7-id3lib.patch
@@ -0,0 +1,73 @@
+diff -Naupr easytag-2.1.7.orig/configure easytag-2.1.7/configure
+--- easytag-2.1.7.orig/configure	2012-01-15 10:25:33.000000000 +0100
++++ easytag-2.1.7/configure	2012-05-17 22:43:16.544316278 +0200
+@@ -18276,7 +18276,7 @@ ac_config_headers="$ac_config_headers co
+ 
+ 
+ 
+-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
+@@ -19369,7 +19369,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" ;;
+ 
+   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+diff -Naupr easytag-2.1.7.orig/configure.in easytag-2.1.7/configure.in
+--- easytag-2.1.7.orig/configure.in	2012-01-15 01:33:15.000000000 +0100
++++ easytag-2.1.7/configure.in	2012-05-17 22:43:16.545316069 +0200
+@@ -475,7 +475,6 @@ AC_OUTPUT([ Makefile
+             src/Makefile
+             src/id3lib/Makefile
+             src/libapetag/Makefile
+-            src/libmpg123/Makefile
+             po/Makefile.in
+          ])
+ 
+diff -Naupr easytag-2.1.7.orig/src/Makefile.in easytag-2.1.7/src/Makefile.in
+--- easytag-2.1.7.orig/src/Makefile.in	2012-01-15 10:25:32.000000000 +0100
++++ easytag-2.1.7/src/Makefile.in	2012-05-17 22:43:16.547259443 +0200
+@@ -61,7 +61,7 @@ am_easytag_OBJECTS = about.$(OBJEXT) ape
+ 	wavpack_tag.$(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. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -269,7 +269,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = libmpg123 libapetag id3lib
++SUBDIRS = libapetag id3lib
+ easytag_SOURCES = \
+  about.c \
+  about.h \
+@@ -351,7 +351,7 @@ EXTRA_DIST = \
+  win32/nsis/easytag-install.ico \
+  win32/nsis/easytag-uninstall.bmp 
+ 
+-easytag_LDADD = $(GTK_LIBS) libmpg123/libmpg123.a libapetag/libapetag.a  id3lib/libid3bugfix.a
++easytag_LDADD = $(GTK_LIBS) libapetag/libapetag.a  id3lib/libid3bugfix.a
+ PACKAGE_DATA_DIR = $(datadir)/$(PACKAGE)
+ INCLUDES = -DLOCALEDIR=\"$(localedir)\" \
+            -DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\"
+diff -Naupr easytag-2.1.7.orig/src/mpeg_header.c easytag-2.1.7/src/mpeg_header.c
+--- easytag-2.1.7.orig/src/mpeg_header.c	2011-07-04 02:59:21.000000000 +0200
++++ easytag-2.1.7/src/mpeg_header.c	2012-05-17 22:43:16.548233444 +0200
+@@ -36,7 +36,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>
diff --git a/easytag.spec b/easytag.spec
index 15c8c3b..c008893 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: 2.1.7
-Release: 0.1%{?dist}
+Release: 1%{?dist}
 # Program is GPL only the included libapetag is LGPL
 License: GPLv2+ and LGPLv2+
 Group: Applications/Multimedia
@@ -11,18 +11,12 @@ URL: http://easytag.sourceforge.net/
 # 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
-# For git :
-# rm -rf src/libmpg123/
-# patch -p1 < /path/to/easytag-2.1.7-src-id3lib.patch
-# ./autogen.sh && ./configure && make dist
-# mv easytag-$VERSION.tar.bz2 easytag-$VERSION-patched.tar.bz2
 Source0: easytag-%{version}-patched.tar.bz2
-# Not applied, used before building the source tarball from git
-Source1: easytag-2.1.7-src-id3lib.patch
-Patch0: easytag-2.1.6-flac-picture.patch
-Patch1: easytag-2.1.6-load-from-txt.patch
-Patch2: easytag-2.1.6-defaults-675421.patch
+Source1: EasyTAG_icon.png
+Patch0: easytag-2.1.7-id3lib.patch
+Patch1: easytag-2.1.6-flac-picture.patch
+Patch2: easytag-2.1.6-load-from-txt.patch
+Patch3: easytag-2.1.6-defaults-675421.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel >= 2.4.0
 BuildRequires: id3lib-devel >= 3.7.12
@@ -42,9 +36,10 @@ MP2, FLAC, Ogg Vorbis, MusePack and Monkey's Audio files.
 
 %prep
 %setup -q
-%patch0 -p1 -b .flac-picture
-%patch1 -p1 -b .load-from-txt
-%patch2 -p1 -b .defaults
+%patch0 -p1 -b .id3lib
+%patch1 -p1 -b .flac-picture
+%patch2 -p1 -b .load-from-txt
+%patch3 -p1 -b .defaults
 f=README ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
 
@@ -57,6 +52,9 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 %find_lang %{name}
+# The included EasyTAG_logo.xpm is low resolution, looks ugly in GNOME 3
+rm -f %{buildroot}%{_datadir}/pixmaps/EasyTAG_icon.xpm
+install -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/EasyTAG_icon.png
 
 
 %clean
@@ -69,11 +67,15 @@ rm -rf %{buildroot}
 %{_bindir}/easytag
 %{_datadir}/applications/easytag.desktop
 %{_datadir}/easytag/
-%{_datadir}/pixmaps/*
+%{_datadir}/pixmaps/EasyTAG_icon.png
 %{_mandir}/man1/easytag.1*
 
 
 %changelog
+* Thu May 17 2012 Matthias Saou <matthias at saou.eu> 2.1.7-1
+- Update to 2.1.7 final.
+- Replace the ugly low-res xpm icon with a nicer png one.
+
 * Wed Feb  8 2012 Matthias Saou <matthias at saou.eu> 2.1.7-0.1
 - Update to 2.1.7 git snapshot.
 - Remove upstreamed patches.
diff --git a/sources b/sources
index 69822ca..03aef9a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-986713b284082f1706aa490040a33a4f  easytag-2.1.7-patched.tar.bz2
+5be4d4dd90bb2135d2fe67fe1ba4a1aa  easytag-2.1.7-patched.tar.bz2

More information about the scm-commits mailing list