rpms/gtkpod/devel gtkpod-0.99.8_libgpod-0.4.2.diff, NONE, 1.1 gtkpod.desktop, NONE, 1.1 gtkpod.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Todd M. Zullinger (tmz) fedora-extras-commits at redhat.com
Fri Feb 23 19:41:41 UTC 2007


Author: tmz

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

Modified Files:
	.cvsignore sources 
Added Files:
	gtkpod-0.99.8_libgpod-0.4.2.diff gtkpod.desktop gtkpod.spec 
Log Message:
auto-import gtkpod-0.99.8-3.fc7 on branch devel from gtkpod-0.99.8-3.fc7.src.rpm
initial import of approved srpm

gtkpod-0.99.8_libgpod-0.4.2.diff:

--- NEW FILE gtkpod-0.99.8_libgpod-0.4.2.diff ---
diff -ru gtkpod-0.99.8/src/file.c gtkpod-0.99.8_libgpod-0.4.2/src/file.c
--- gtkpod-0.99.8/src/file.c	2006-09-24 15:42:52.000000000 +0900
+++ gtkpod-0.99.8_libgpod-0.4.2/src/file.c	2007-01-16 01:06:52.000000000 +0900
@@ -851,7 +851,7 @@
     to->time_modified = from->time_modified;
     to->year = from->year;
     to->compilation = from->compilation;
-    to->unk208 = from->unk208;
+    to->mediatype = from->mediatype;
     to->lyrics_flag = from->lyrics_flag;
     to->movie_flag = from->movie_flag;
 }
@@ -1069,25 +1069,25 @@
     {
     case FILE_TYPE_MP3:
 	nti = mp3_get_file_info (name);
-	/* Set unk208 to audio */
-	if (nti) nti->unk208 = 0x00000001;
+	/* Set mediatype to audio */
+	if (nti) nti->mediatype = 0x00000001;
 	break;
     case FILE_TYPE_M4A:
     case FILE_TYPE_M4P:
     case FILE_TYPE_M4B:
 	nti = mp4_get_file_info (name);
-	/* Set unk208 to audio */
+	/* Set mediatype to audio */
 	if (nti)
 	{
-	    nti->unk208 = 0x00000001;
+	    nti->mediatype = 0x00000001;
 	}
 	break;
     case FILE_TYPE_WAV:
 	nti = wav_get_file_info (name);
-	/* Set unk208 to audio */
+	/* Set mediatype to audio */
 	if (nti)
 	{
-	    nti->unk208 = 0x00000001;
+	    nti->mediatype = 0x00000001;
 	}
 	break;
     case FILE_TYPE_M4V:
@@ -1096,10 +1096,10 @@
 	   this. Let's see if someone complains. */
 	nti = mp4_get_file_info (name);
 	if (!nti) video_get_file_info (name);
-	/* Set unk208 to video */
+	/* Set mediatype to video */
 	if (nti)
 	{
-	    nti->unk208 = 0x00000002;
+	    nti->mediatype = 0x00000002;
 	    nti->movie_flag = 0x01;
 	}	
 	break;
@@ -1107,10 +1107,10 @@
     case FILE_TYPE_MPG:
 	/* for now treat all the same */
 	nti = video_get_file_info (name);
-	/* Set unk208 to video */
+	/* Set mediatype to video */
 	if (nti)
 	{
-	    nti->unk208 = 0x00000002;
+	    nti->mediatype = 0x00000002;
 	    nti->movie_flag = 0x01;
 	}
 	break;
diff -ru gtkpod-0.99.8/src/file_itunesdb.c gtkpod-0.99.8_libgpod-0.4.2/src/file_itunesdb.c
--- gtkpod-0.99.8/src/file_itunesdb.c	2006-06-26 01:08:22.000000000 +0900
+++ gtkpod-0.99.8_libgpod-0.4.2/src/file_itunesdb.c	2007-01-16 01:06:52.000000000 +0900
@@ -589,9 +589,9 @@
 		track->has_artwork = 0x02;
 	}
 
-	/* set unk208 to audio if unset (important only for iPod Video) */
-	if (track->unk208 == 0)
-	    track->unk208 = 0x00000001;
+	/* set mediatype to audio if unset (important only for iPod Video) */
+	if (track->mediatype == 0)
+	    track->mediatype = 0x00000001;
 	/* restore deleted thumbnails */
 	if ((track->artwork->thumbnails == NULL) &&
 	    (strlen (etr->thumb_path_locale) != 0))


--- NEW FILE gtkpod.desktop ---
[Desktop Entry]
Name=GtkPod
GenericName=iPod Song Manager
Comment=Manage songs on an Apple iPod
Exec=gtkpod
Icon=gtkpod.png
Type=Application
Categories=AudioVideo;
Encoding=UTF-8


--- NEW FILE gtkpod.spec ---
Name:           gtkpod
Version:        0.99.8
Release:        3%{?dist}
Summary:        Graphical song management program for Apple's iPod

Group:          Applications/Multimedia
License:        GPL
URL:            http://www.gtkpod.org
Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1:        %{name}.desktop
Patch0:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}_libgpod-0.4.2.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils
BuildRequires:  flex
BuildRequires:  gettext
BuildRequires:  libglade2-devel
BuildRequires:  libgpod-devel >= 0.4.2
BuildRequires:  libid3tag-devel
BuildRequires:  libmp4v2-devel

%description
gtkpod is a platform independent Graphical User Interface for Apple's
iPod using GTK2. It supports the first to fifth Generation including
the iPod mini, iPod Photo, iPod Shuffle, iPod nano, and iPod Video.


%prep
%setup -q
# patch from upstream to build against libgpod-0.4.2
%patch -p1 -b .libgpod-0.4.2

cp -p %{SOURCE1} %{name}.desktop

%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"

# install symlink to menu icon
mkdir -p %{buildroot}%{_datadir}/pixmaps
ln -s ../%{name}/pixmaps/%{name}-icon-48.png \
    %{buildroot}%{_datadir}/pixmaps/%{name}.png

# install menu entry
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install \
    --vendor fedora \
    --mode 0644 \
    --dir %{buildroot}%{_datadir}/applications \
    %{name}.desktop

%find_lang %{name}


%clean
rm -rf %{buildroot}


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog* COPYING README TODOandBUGS.txt TROUBLESHOOTING
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/*.desktop


%changelog
* Fri Feb 16 2007 Todd Zullinger <tmz at pobox.com> - 0.99.8-3
- preserve timestamps when copying .desktop file to builddir and
  running make install
- use a symlink for the menu icon

* Mon Feb 12 2007 Todd Zullinger <tmz at pobox.com> - 0.99.8-2
- remove redundant gtk2-devel BR
- move .desktop creation to a separate file
- remove livna stuff from .desktop file
- don't use macros for install and mkdir
- remove NEWS file from %%doc as it mostly mirrors the ChangeLog

* Mon Feb 12 2007 Todd Zullinger <tmz at pobox.com> - 0.99.8-1
- initial fedora package, parts stolen from Matthias' FreshRPMS spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkpod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Feb 2007 18:51:41 -0000	1.1
+++ .cvsignore	23 Feb 2007 19:41:08 -0000	1.2
@@ -0,0 +1 @@
+gtkpod-0.99.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkpod/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Feb 2007 18:51:41 -0000	1.1
+++ sources	23 Feb 2007 19:41:08 -0000	1.2
@@ -0,0 +1 @@
+f04b67605204d9076d30d83b72b78463  gtkpod-0.99.8.tar.gz




More information about the scm-commits mailing list