[kid3] Update to 2.0. Clean up no longer needed specfile parts. Do icon dir timestamp update in %post with
Ville Skyttä
scop at fedoraproject.org
Thu Sep 8 16:21:30 UTC 2011
commit a01e07d15cb6d8dbd8b69b8660a53b456a91c9a5
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Thu Sep 8 19:20:55 2011 +0300
Update to 2.0.
Clean up no longer needed specfile parts.
Do icon dir timestamp update in %post with lua.
.gitignore | 2 +-
...re-sgml-docbook-xsl-stylesheets-to-DocBoo.patch | 26 +++++++
0002-Fix-non-KDE-doc-install-dir.patch | 25 +++++++
...-Qt-translation-files-use-system-default-.patch | 74 ++++++++++++++++++++
kid3.spec | 60 +++++++++-------
sources | 2 +-
6 files changed, 162 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 514dd1f..dafa321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kid3-1.6.tar.gz
+/*.tar.*
diff --git a/0001-Add-usr-share-sgml-docbook-xsl-stylesheets-to-DocBoo.patch b/0001-Add-usr-share-sgml-docbook-xsl-stylesheets-to-DocBoo.patch
new file mode 100644
index 0000000..f9d05b6
--- /dev/null
+++ b/0001-Add-usr-share-sgml-docbook-xsl-stylesheets-to-DocBoo.patch
@@ -0,0 +1,26 @@
+From e163ed4c66e2e74e57e4c33487d353429383b957 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
+Date: Thu, 8 Sep 2011 00:12:50 +0300
+Subject: [PATCH] Add /usr/share/sgml/docbook/xsl-stylesheets to DocBook XSL
+ search path.
+
+This is the default install location for them at least on Fedora.
+---
+ CMakeLists.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 85621f4..28b5899 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -113,6 +113,7 @@ endif (NOT XSLTPROC)
+ ### Check for HTML docbook.xsl
+ find_path(DOCBOOK_XSL_DIR html/docbook.xsl
+ PATHS /usr/share/xml/docbook/stylesheet/nwalsh
++ /usr/share/sgml/docbook/xsl-stylesheets
+ /usr/share/apps/ksgmltools2/docbook/xsl
+ $ENV{DOCBOOKDIR}
+ $ENV{HOME}/docbook-xsl-1.72.0
+--
+1.7.5.1
+
diff --git a/0002-Fix-non-KDE-doc-install-dir.patch b/0002-Fix-non-KDE-doc-install-dir.patch
new file mode 100644
index 0000000..2327704
--- /dev/null
+++ b/0002-Fix-non-KDE-doc-install-dir.patch
@@ -0,0 +1,25 @@
+From 1ec24367d78e232f958d7bfc474a7081e27920f4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
+Date: Thu, 8 Sep 2011 17:52:12 +0300
+Subject: [PATCH 2/3] Fix non-KDE doc install dir.
+
+---
+ doc/CMakeLists.txt | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 586fbc5..fb81d32 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -35,7 +35,7 @@ macro (kid3_create_handbook _docbook)
+ )
+ endif (WIN32)
+ add_custom_target("${_lang}-handbook" ALL DEPENDS ${_output})
+- install(FILES ${_output} DESTINATION ${WITH_DOCDIR})
++ install(FILES ${_output} DESTINATION ${CMAKE_INSTALL_PREFIX_SLASH}${WITH_DOCDIR})
+ endmacro (kid3_create_handbook)
+
+ endif (NOT WITH_KDE)
+--
+1.7.5.1
+
diff --git a/0004-Do-not-copy-Qt-translation-files-use-system-default-.patch b/0004-Do-not-copy-Qt-translation-files-use-system-default-.patch
new file mode 100644
index 0000000..9df9645
--- /dev/null
+++ b/0004-Do-not-copy-Qt-translation-files-use-system-default-.patch
@@ -0,0 +1,74 @@
+From 8161e1e17c5c9d524d0bff48bba6111bfeadb1a5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
+Date: Thu, 8 Sep 2011 18:24:12 +0300
+Subject: [PATCH 4/4] Do not copy Qt translation files, use system default
+ ones instead.
+
+---
+ po/CMakeLists.txt | 12 ++----------
+ src/gui/app/main.cpp | 6 ++----
+ 2 files changed, 4 insertions(+), 14 deletions(-)
+
+diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
+index 7ff80b8..ea2646a 100644
+--- a/po/CMakeLists.txt
++++ b/po/CMakeLists.txt
+@@ -38,20 +38,12 @@ ENDIF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE )
+ else(WITH_KDE)
+
+ # Generate .ts files from the .po files and then convert them to .qm files.
+- # Also copy or convert the Qt language files from the Qt installation.
+ file(GLOB _poFiles *.po)
+ set(_tsFiles)
+- set(_qtQmFiles)
+- set(_qtTsFiles)
+
+ foreach (_currentPoFile ${_poFiles})
+ get_filename_component(_lang ${_currentPoFile} NAME_WE)
+ set(_tsFiles ${_tsFiles} ${CMAKE_CURRENT_BINARY_DIR}/kid3_${_lang}.ts)
+- if (EXISTS ${QT_TRANSLATIONS_DIR}/qt_${_lang}.qm)
+- set(_qtQmFiles ${_qtQmFiles} ${QT_TRANSLATIONS_DIR}/qt_${_lang}.qm)
+- elseif (EXISTS ${QT_TRANSLATIONS_DIR}/qt_${_lang}.ts)
+- set(_qtTsFiles ${_qtTsFiles} ${QT_TRANSLATIONS_DIR}/qt_${_lang}.ts)
+- endif (EXISTS ${QT_TRANSLATIONS_DIR}/qt_${_lang}.qm)
+ endforeach (_currentPoFile)
+
+ add_custom_command(
+@@ -61,8 +53,8 @@ else(WITH_KDE)
+ ${CMAKE_CURRENT_SOURCE_DIR}/../src
+ DEPENDS ${_poFiles}
+ )
+- qt4_add_translation(_qmFiles ${_tsFiles} ${_qtTsFiles})
++ qt4_add_translation(_qmFiles ${_tsFiles})
+ add_custom_target(translations "ALL" DEPENDS ${_qmFiles})
+- install(FILES ${_qmFiles} ${_qtQmFiles} DESTINATION ${WITH_TRANSLATIONSDIR})
++ install(FILES ${_qmFiles} DESTINATION ${WITH_TRANSLATIONSDIR})
+
+ endif(WITH_KDE)
+diff --git a/src/gui/app/main.cpp b/src/gui/app/main.cpp
+index aaa1c19..c25593c 100644
+--- a/src/gui/app/main.cpp
++++ b/src/gui/app/main.cpp
+@@ -86,6 +86,7 @@ int main(int argc, char* argv[])
+ #else
+
+ #include <QApplication>
++#include <QLibraryInfo>
+ #include <QLocale>
+ #include <QTranslator>
+ #include <QDir>
+@@ -111,10 +112,7 @@ int main(int argc, char* argv[])
+
+ // translation file for Qt
+ QTranslator qt_tr(0);
+-#ifdef CFG_TRANSLATIONSDIR
+- if (!qt_tr.load(QString("qt_") + locale, CFG_TRANSLATIONSDIR))
+-#endif
+- qt_tr.load( QString("qt_") + locale, "." );
++ qt_tr.load(QString("qt_") + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+ app.installTranslator(&qt_tr);
+
+ // translation file for application strings
+--
+1.7.5.1
+
diff --git a/kid3.spec b/kid3.spec
index e354be1..88b7954 100644
--- a/kid3.spec
+++ b/kid3.spec
@@ -1,15 +1,17 @@
Name: kid3
-Version: 1.6
-Release: 3%{?dist}
+Version: 2.0
+Release: 1%{?dist}
Summary: Efficient KDE ID3 tag editor
-Group: Applications/Multimedia
License: GPLv2+
URL: http://kid3.sourceforge.net/
Source0: http://downloads.sourceforge.net/kid3/%{name}-%{version}.tar.gz
-# http://sf.net/tracker/?func=detail&aid=3173628&group_id=70849&atid=529223
-Patch0: %{name}-1.6-qt-startupwmclass.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Sent upstream 2011-09-08
+Patch0: 0001-Add-usr-share-sgml-docbook-xsl-stylesheets-to-DocBoo.patch
+# Sent upstream 2011-09-08
+Patch1: 0002-Fix-non-KDE-doc-install-dir.patch
+# Sent upstream 2011-09-08
+Patch2: 0004-Do-not-copy-Qt-translation-files-use-system-default-.patch
BuildRequires: kdelibs4-devel
BuildRequires: cmake
@@ -18,7 +20,6 @@ BuildRequires: taglib-devel >= 1.4
BuildRequires: flac-devel
BuildRequires: libtunepimp-devel
BuildRequires: libvorbis-devel
-BuildRequires: libmp4v2-devel
BuildRequires: gettext
Requires: xdg-utils
@@ -45,22 +46,32 @@ dependencies.
%prep
%setup -q
-%patch0 -p0
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
-%cmake_kde4
+# -DBUILD_SHARED_LIBS:BOOL=OFF:
+# http://sf.net/tracker/?func=detail&aid=3405853&group_id=70849&atid=529221
+
+mkdir _kid3 ; cd _kid3
+%cmake_kde4 -DBUILD_SHARED_LIBS:BOOL=OFF ..
make %{?_smp_mflags}
-cd kid3-qt
-%configure --without-kde --with-docdir=%{_docdir}/%{name}-qt-%{version}
+cd ..
+
+mkdir _kid3-qt ; cd _kid3-qt
+%cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DWITH_KDE=OFF \
+ -DWITH_DOCDIR=share/doc/%{name}-qt-%{version} ..
make %{?_smp_mflags}
+cd ..
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-make -C kid3-qt install INSTALL_ROOT=$RPM_BUILD_ROOT
+make -C _kid3 install DESTDIR=$RPM_BUILD_ROOT
+make -C _kid3-qt install DESTDIR=$RPM_BUILD_ROOT
+
install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man1
install -pm 644 deb/kid3{,-qt}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -71,7 +82,7 @@ rmdir $RPM_BUILD_ROOT%{_datadir}/applications/kde*
desktop-file-install \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/fedora-kid3.desktop
-
+
%find_lang %{name} --with-kde --with-qt
grep -vF kid3-qt %{name}.lang > %{name}-kde.lang
grep -F kid3-qt %{name}.lang > %{name}-qt.lang
@@ -80,15 +91,11 @@ install -pm 644 AUTHORS ChangeLog COPYING LICENSE README \
$RPM_BUILD_ROOT%{_docdir}/%{name}-qt-%{version}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+%post -p <lua>
+posix.utime("%{_datadir}/icons/hicolor")
-%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%post qt
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+%post qt -p <lua>
+posix.utime("%{_datadir}/icons/hicolor")
%postun
if [ $1 -eq 0 ] ; then
@@ -114,7 +121,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}-kde.lang
-%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING LICENSE README
%{_bindir}/kid3
%{_datadir}/applications/*kid3.desktop
@@ -125,7 +131,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_mandir}/man1/kid3.1*
%files qt -f %{name}-qt.lang
-%defattr(-,root,root,-)
%doc %{_docdir}/%{name}-qt-%{version}/
%{_bindir}/kid3-qt
%{_datadir}/applications/*kid3-qt.desktop
@@ -138,6 +143,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Thu Sep 8 2011 Ville Skyttä <ville.skytta at iki.fi> - 2.0-1
+- Update to 2.0.
+- Clean up no longer needed specfile parts.
+- Do icon dir timestamp update in %%post with lua.
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index f206572..131f691 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ba5192c9e7c1ed35a04c8efbb2bafb7a kid3-1.6.tar.gz
+a0148a856b2261ba5ff234d19277434f kid3-2.0.tar.gz
More information about the scm-commits
mailing list