[gtkpod/f14] Update to 2.0.2 Minor spec file cleanup

chkr chkr at fedoraproject.org
Tue Aug 30 23:28:12 UTC 2011


commit 348a9bd074bdabe0ad01bf3dd4c245f40a44e90c
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Wed Aug 31 01:27:55 2011 +0200

    Update to 2.0.2
    Minor spec file cleanup

 .gitignore                              |    2 +
 gtkpod-0.99.14-lame-tag-endianess.patch |  103 -------------------------------
 gtkpod-0.99.14-use-xdg-open.patch       |   14 ----
 gtkpod.spec                             |   71 +++++++++++++--------
 sources                                 |    2 +-
 5 files changed, 46 insertions(+), 146 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 65da999..7e889fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 gtkpod-1.0.0.tar.gz
+/gtkpod-2.1.0.tar.gz
+/gtkpod-2.0.2.tar.gz
diff --git a/gtkpod.spec b/gtkpod.spec
index a0c1ecd..c499128 100644
--- a/gtkpod.spec
+++ b/gtkpod.spec
@@ -1,54 +1,58 @@
 Name:           gtkpod
-Version:        1.0.0
-Release:        2%{?dist}
+Version:        2.0.2
+Release:        1%{?dist}
 Summary:        Graphical song management program for Apple's iPod
 
 Group:          Applications/Multimedia
 # The help documentation is under GFDL, the rest of the code is GPLv2+
 License:        GPLv2+ and GFDL
-URL:            http://www.gtkpod.org
+URL:            http://www.gtkpod.org/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# https://bugzilla.redhat.com/449199
-Patch0:         gtkpod-0.99.14-use-xdg-open.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  gtk2-devel
+BuildRequires:  libgdl-devel
 BuildRequires:  curl-devel
+BuildRequires:  gstreamer-devel
+BuildRequires:  gstreamer-plugins-base-devel
+BuildRequires:  anjuta-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  flac-devel
 BuildRequires:  flex
 BuildRequires:  gettext
-BuildRequires:  gnome-vfs2-devel
-BuildRequires:  hal-devel
 BuildRequires:  intltool
-BuildRequires:  libglade2-devel
 BuildRequires:  libgpod-devel >= 0.7.0
 BuildRequires:  libid3tag-devel
 BuildRequires:  libmp4v2-devel
 BuildRequires:  libvorbis-devel
 BuildRequires:  perl(XML::Parser)
+BuildRequires:  pkgconfig
 
-# some of the scripts in %{_datadir}/%{name}/scripts use which
+# some of the scripts in %%{_datadir}/%%{name}/scripts use which
 Requires:       which
-Requires:       xdg-utils
+Requires:       hicolor-icon-theme
 
 %description
 gtkpod is a platform independent Graphical User Interface for Apple's
-iPod using GTK2. It supports all current iPod models, including
+iPod using GTK3. It supports all current iPod models, including
 the Mini, Photo, Shuffle, Nano, Video, Classic, Touch, and iPhone.
 
+%package devel
+Summary: Development files for the gtkpod
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+The gtkpod-devel package contains libraries and header files for
+developing extensions for gtkpod.
 
 %prep
 %setup -q
-%patch0 -p1 -b .use-xdg-open
-
 
 %build
-%configure
+%configure --disable-static
 make %{?_smp_mflags}
 
-
 %install
-rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="install -p"
 
 desktop-file-install \
@@ -59,24 +63,23 @@ desktop-file-install \
 
 %find_lang %{name}
 
-
-%clean
-rm -rf %{buildroot}
+# delete libtool files
+find %{buildroot} -name '*.la' -exec rm -f {} \;
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
+/sbin/ldconfig
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -86,9 +89,21 @@ fi
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/applications/*.desktop
 %{_mandir}/man1/%{name}*
+%dir %{_libdir}/gtkpod
+%{_libdir}/gtkpod/*.plugin
+%{_libdir}/gtkpod/*.so
+%{_libdir}/*.so.*
 
+%files devel
+%{_includedir}/gtkpod
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Aug 30 2011 Christian Krause <chkr at fedoraproject.org> - 2.0.2-1
+- Update to 2.0.2
+- Minor spec file cleanup
+
 * Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 1.0.0-2
 - recompiling .py files against Python 2.7 (rhbz#623316)
 
diff --git a/sources b/sources
index bbe4b6a..98ae9f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cadd402dcd1cfbedda0357bf24965a7c  gtkpod-1.0.0.tar.gz
+a24d4b882fa1e71c486ee90d87c7ce45  gtkpod-2.0.2.tar.gz


More information about the scm-commits mailing list