rpms/gpixpod/devel gpixpod-exec.patch, NONE, 1.1 gpixpod-setup.patch, NONE, 1.1 gpixpod.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Deji Akingunola (deji)
fedora-extras-commits at redhat.com
Tue Feb 13 21:14:18 UTC 2007
Author: deji
Update of /cvs/extras/rpms/gpixpod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5980/devel
Modified Files:
.cvsignore sources
Added Files:
gpixpod-exec.patch gpixpod-setup.patch gpixpod.spec
Log Message:
auto-import gpixpod-0.6.2-1 on branch devel from gpixpod-0.6.2-1.src.rpm
Initial import
gpixpod-exec.patch:
--- NEW FILE gpixpod-exec.patch ---
--- gpixpod 2006-09-29 16:29:50.000000000 -0400
+++ gpixpod.new 2006-12-28 20:12:55.000000000 -0500
@@ -1,2 +1,5 @@
#!/bin/bash
-exec python2.4 /usr/lib/gpixpod/gpixpod.py "$@"
+
+PYTHON_DIR=`python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'`
+
+exec python ${PYTHON_DIR}/gpixpod/gpixpod.py "$@"
gpixpod-setup.patch:
--- NEW FILE gpixpod-setup.patch ---
--- setup.py 2006-10-11 10:48:39.000000000 -0400
+++ setup.py 2006-12-28 19:15:29.000000000 -0500
@@ -47,11 +47,10 @@
py_modules=['mh', 'gpixpod', 'gpixpod_cli', 'utils', 'ipodhal'],
scripts = ['gpixpod'],
ext_modules = [imgconvert],
- data_files = [('lib/gpixpod', ['gpixpod.glade']),
- ('lib/gpixpod/po/it/LC_MESSAGES', ['po/it/LC_MESSAGES/gpixpod.mo']),
- ('lib/gpixpod/po/es/LC_MESSAGES', ['po/es/LC_MESSAGES/gpixpod.mo']),
+ data_files = [('share/gpixpod', ['gpixpod.glade']),
+ ('share/locale/it/LC_MESSAGES', ['po/it/LC_MESSAGES/gpixpod.mo']),
+ ('share/locale/es/LC_MESSAGES', ['po/es/LC_MESSAGES/gpixpod.mo']),
('share/applications', ['GPixPod.desktop']),
('share/man/man1', ['gpixpod.1.gz']),
- ('share/doc/gpixpod', ['README', 'CHANGELOG', 'TODO', 'KNOWNBUGS']),
('share/gpixpod', ['GPixPod.png', 'GPixPod_icon.png', 'ipod.png', 'photoalbum.png'])]
)
--- gpixpod.py 2006-10-11 10:38:05.000000000 -0400
+++ gpixpod.py.new 2006-12-28 21:06:31.000000000 -0500
@@ -109,7 +109,11 @@
'on_progresspausebutton_clicked':self.PauseProgress, 'on_progressstopbutton_clicked':self.StopProgress,
'on_toolbar2_activate':self.ToggleToolbar,
'on_list_previews1_activate':self.TogglePreviews, 'on_details_pane1_activate':self.ToggleDetails}
- self.win = gtk.glade.XML('gpixpod.glade', 'window1', 'gpixpod')
+ if os.path.isfile('gpixpod.glade'):
+ self.glade = 'gpixpod.glade'
+ else:
+ self.glade = '/usr/share/gpixpod/gpixpod.glade'
+ self.win = gtk.glade.XML(self.glade, 'window1', 'gpixpod')
self.win.signal_autoconnect(self.win_callbacks)
self.window = self.win.get_widget('window1')
self.treeview = self.win.get_widget('treeview1')
@@ -905,7 +909,7 @@
try:
photoid = self.GetCurrentTVPhotoID()
self.slideshow_current_photoid = photoid
- self.slideshow = gtk.glade.XML('gpixpod.glade', 'slideshowwindow', 'gpixpod')
+ self.slideshow = gtk.glade.XML(self.glade, 'slideshowwindow', 'gpixpod')
self.slideshow_callbacks = {'on_slideshowclosebutton_clicked':self.SlideShowQuit,
'on_slideshowbackbutton_clicked':self.SlideShowBack,
'on_slideshowforwardbutton_clicked':self.SlideShowForward}
@@ -1102,7 +1106,7 @@
def ShowGetLine(self, widget, ok_function, title=None, message=None, entrytext=None):
""" Show a dialog to let enter a new line (e.g. to add a new album, or to renaming an existing one) """
- self.getline = gtk.glade.XML('gpixpod.glade', 'dialog2', 'gpixpod')
+ self.getline = gtk.glade.XML(self.glade, 'dialog2', 'gpixpod')
self.getlineinput = self.getline.get_widget('dialog2')
if self.icon:
self.getlineinput.set_icon_from_file(self.icon)
@@ -1133,7 +1137,7 @@
def ShowChooser(self, widget, ok_function, filter_name=None, pattern=None, multiple=False, path=None, preview=False, chooser_type=None, title=None, savefilename=None):
""" Show file chooser, to select and open file based on the pattern specified, passing to the specified function """
self.chooser_callbacks = {'on_button1_clicked':self.DestroyChooser, 'on_button2_clicked':ok_function}
- self.chooser = gtk.glade.XML('gpixpod.glade', 'filechooserdialog1', 'gpixpod')
+ self.chooser = gtk.glade.XML(self.glade, 'filechooserdialog1', 'gpixpod')
self.chooser.signal_autoconnect(self.chooser_callbacks)
self.filechooser = self.chooser.get_widget('filechooserdialog1')
if self.icon:
@@ -1556,7 +1560,7 @@
def ShowIpodInfo(self, widget):
""" Show the iPod info dialog """
- self.ipodinfo = gtk.glade.XML('gpixpod.glade', 'ipodinfodialog', 'gpixpod')
+ self.ipodinfo = gtk.glade.XML(self.glade, 'ipodinfodialog', 'gpixpod')
self.ipodinfodlg = self.ipodinfo.get_widget('ipodinfodialog')
self.ipodinfo.signal_connect('on_ipodinfookbutton_clicked', self.DestroyIpodInfo)
if self.ipodicon:
@@ -1591,7 +1595,7 @@
def ShowAbout(self, widget):
""" Show the about dialog """
gtk.about_dialog_set_url_hook(self.LaunchBrowser)
- self.about = gtk.glade.XML('gpixpod.glade', 'aboutdialog1', 'gpixpod')
+ self.about = gtk.glade.XML(self.glade, 'aboutdialog1', 'gpixpod')
self.aboutdlg = self.about.get_widget('aboutdialog1')
if self.icon:
self.aboutdlg.set_icon_from_file(self.icon)
@@ -1600,7 +1604,7 @@
def ShowPreferences(self, widget):
""" Show the preferences dialog """
- self.preferences = gtk.glade.XML('gpixpod.glade', 'preferencesdialog', 'gpixpod')
+ self.preferences = gtk.glade.XML(self.glade, 'preferencesdialog', 'gpixpod')
self.preferencesdlg = self.preferences.get_widget('preferencesdialog')
if self.icon:
self.preferencesdlg.set_icon_from_file(self.icon)
--- NEW FILE gpixpod.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Summary: An ipod photo organizer
Name: gpixpod
Version: 0.6.2
Release: 1%{?dist}
Group: Applications/Multimedia
License: GPL
URL: http://www.gpixpod.org
Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
Patch0: gpixpod-setup.patch
Patch1: gpixpod-exec.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
BuildRequires: gtk2-devel
BuildRequires: desktop-file-utils
%description
GPixPod let you manage your collection of photos uploading
them to your iPod, organizing them in photo albums.
Instead of the iTunes synchronization approach, GPixPod
let you choose your manual operations on your photos and
photo albums, such as adding/deleting individual photos
and photo albums, and renaming photo albums
%prep
%setup -q
%patch0 -p0 -b .setup
%patch1 -p0 -b .exec
# Silence rpmlint
sed -e '/^#!\//,1 d' -i {mh,gpixpod,gpixpod_cli}.py
%build
%{__python} setup.py build
%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
mkdir -p %{buildroot}%{python_sitearch}/gpixpod
mv %{buildroot}%{python_sitearch}/*.* %{buildroot}%{python_sitearch}/gpixpod/
desktop-file-install --delete-original \
--vendor fedora \
--remove-category Application \
--dir %{buildroot}%{_datadir}/applications \
--mode 0644 \
%{buildroot}%{_datadir}/applications/GPixPod.desktop
%find_lang %{name}
%clean
rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc CHANGELOG COPYING KNOWNBUGS README TODO
%{_bindir}/gpixpod
%{python_sitearch}/gpixpod/
%{_datadir}/applications/fedora-GPixPod.desktop
%{_datadir}/gpixpod/
%{_mandir}/man1/gpixpod.1.gz
%changelog
* Thu Dec 28 2006 Deji Akingunola <dakingun at gmail.com> - 0.6.2-1
- Initial Fedora Package
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpixpod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 12 Feb 2007 18:39:58 -0000 1.1
+++ .cvsignore 13 Feb 2007 21:13:45 -0000 1.2
@@ -0,0 +1 @@
+gpixpod-0.6.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpixpod/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 12 Feb 2007 18:39:58 -0000 1.1
+++ sources 13 Feb 2007 21:13:45 -0000 1.2
@@ -0,0 +1 @@
+2136a65e7b72ba5f5cd7ae5ebdc2205c gpixpod-0.6.2.tar.gz
More information about the fedora-extras-commits
mailing list