- up to 2.1.0, gtk3 version

Changed files:
    desktop.patch -> 1.2
    gtkpod.spec -> 1.35

diff --git a/desktop.patch b/desktop.patch
index 36d264b5da7bb97188adaeee3e01fc2d10c55aba..017a648db34789a60e64210a67c98cbe576531d8 100644 (file)
--- a/desktop.patch
+++ b/desktop.patch
@@ -1,11 +1,12 @@
 the pl comment should go to .po file really
 
---- gtkpod-1.0.0/data/gtkpod.desktop.in~       2010-08-01 17:02:42.000000000 +0300
-+++ gtkpod-1.0.0/data/gtkpod.desktop.in        2010-12-28 01:17:41.542790127 +0200
-@@ -2,8 +2,9 @@
- _Name=gtkpod iPod Manager
+--- gtkpod-2.1.0/data/gtkpod.desktop.in~       2011-08-06 19:03:49.000000000 +0300
++++ gtkpod-2.1.0/data/gtkpod.desktop.in        2011-08-15 16:58:56.946994824 +0300
+@@ -2,9 +2,11 @@
+ _Name=gtkpod
  _GenericName=iPod Manager
  _Comment=Manage music and video on an Apple iPod
++# TODO: use add po/pl.po create pl.po-update.patch or sth, and submit it upstream
 +Comment[pl]=Graficzny menadżer utworów muzycznych dla urządzeń Apple iPod
  Exec=gtkpod
  Icon=gtkpod
@@ -13,3 +14,4 @@ the pl comment should go to .po file really
  Type=Application
 -Categories=GTK;AudioVideo;
 +Categories=GTK;Utility;Audio;
+ X-GNOME-FullName=gtkpod iPod Manager

diff --git a/gtkpod.spec b/gtkpod.spec
index e7057f3e9b5ca89d45f7d240c1e2d36c100c7f03..d0f22c4ab84c73fb340b4f97fd2b9eac9796cc8e 100644 (file)
--- a/gtkpod.spec
+++ b/gtkpod.spec
@@ -1,22 +1,26 @@
 Summary:       Graphical song management program for Apple's iPod
 Summary(pl.UTF-8):     Graficzny menadżer utworów muzycznych dla urządzeń Apple iPod
 Name:          gtkpod
-Version:       2.0.2
+Version:       2.1.0
 Release:       1
 License:       GPL/LGPL
 Group:         X11/Applications/Multimedia
 Source0:       http://downloads.sourceforge.net/gtkpod/%{name}-%{version}.tar.gz
-# Source0-md5: a24d4b882fa1e71c486ee90d87c7ce45
+# Source0-md5: 8e01f7cf2db1a421140eab561aee26d7
 Patch1:                desktop.patch
 URL:           http://www.gtkpod.org/
 BuildRequires: flex
+BuildRequires: gdl-devel >= 3.0.0
 BuildRequires: gettext-devel >= 0.11.0
-BuildRequires: gtk+2-devel >= 2:2.4.0
+BuildRequires: glib2-devel >= 1:2.28.5
+BuildRequires: gtk+3-devel >= 3.0.11
 BuildRequires: intltool
+BuildRequires: libanjuta-devel >= 1:3.0
 BuildRequires: libglade2-devel >= 1:2.4.0
 BuildRequires: libgnomecanvas-devel
 BuildRequires: libgpod-devel >= 0.4.0
 BuildRequires: libid3tag-devel >= 0.15
+BuildRequires: libxml2-devel >= 2.7.7
 BuildRequires: perl-XML-Parser
 BuildRequires: pkgconfig
 BuildRequires: rpm-pythonprov
@@ -24,6 +28,7 @@ BuildRequires:        rpmbuild(macros) >= 1.596
 BuildRequires: sed >= 4.0
 Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): hicolor-icon-theme
+Requires(post,postun): glib2 >= 1:2.26.0
 Requires:      mount
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -38,10 +43,11 @@ urządzeń Apple iPod. Pozwala wgrywać pliki i listy utworów do iPoda.
 %prep
 %setup -q
 %patch1 -p1
-sed -ie 's!/usr/bin/awk!/bin/awk!g' scripts/ldif2vcf.sh
+%{__sed} -i -e 's!/usr/bin/awk!/bin/awk!g' scripts/ldif2vcf.sh
 
 %build
-%configure
+%configure \
+       --disable-static
 %{__make}
 
 %install
@@ -49,7 +55,15 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/gtkpod.svg
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/gtkpod.svg
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gtkpod/*.la
+
+# no -devel
+%{__rm} -r $RPM_BUILD_ROOT%{_includedir}
+%{__rm} $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgtkpod.so
 
 %find_lang %{name} --all-name
 
@@ -58,15 +72,26 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_icon_cache hicolor
+%glib_compile_schemas
 
 %postun
 %update_icon_cache hicolor
+%postun
+if [ "$1" = "0" ]; then
+       %glib_compile_schemas
+fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODOandBUGS.txt
 %attr(755,root,root) %{_bindir}/%{name}
+%attr(755,root,root) %{_libdir}/libgtkpod.so.*.*.*
+%ghost %{_libdir}/libgtkpod.so.1
 %{_mandir}/man1/%{name}.1*
-%{_datadir}/%{name}
+%dir %{_datadir}/%{name}
+%{_datadir}/glib-2.0/schemas/org.gtkpod.gschema.xml
 %{_desktopdir}/%{name}.desktop
 %{_iconsdir}/hicolor/*/apps/%{name}.png
+%dir %{_libdir}/gtkpod
+%attr(755,root,root) %{_libdir}/gtkpod/lib*.so
+%{_libdir}/gtkpod/*.plugin