rpms/nicotine+/devel import.log, NONE, 1.1 nicotine+-1.2.14-commands.patch, NONE, 1.1 nicotine+-1.2.14-desktop.patch, NONE, 1.1 nicotine+-1.2.14-glade_install.patch, NONE, 1.1 nicotine+-1.2.14-guide.patch, NONE, 1.1 nicotine+.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Mohamed ElMorabity
melmorabity at fedoraproject.org
Tue Jan 19 18:41:52 UTC 2010
Author: melmorabity
Update of /cvs/pkgs/rpms/nicotine+/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13336/devel
Modified Files:
.cvsignore sources
Added Files:
import.log nicotine+-1.2.14-commands.patch
nicotine+-1.2.14-desktop.patch
nicotine+-1.2.14-glade_install.patch
nicotine+-1.2.14-guide.patch nicotine+.spec
Log Message:
First import
--- NEW FILE import.log ---
nicotine+-1_2_14-5_fc12:HEAD:nicotine+-1.2.14-5.fc12.src.rpm:1263926290
nicotine+-1.2.14-commands.patch:
config.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE nicotine+-1.2.14-commands.patch ---
diff -up nicotine+-1.2.14/pynicotine/config.py.orig nicotine+-1.2.14/pynicotine/config.py
--- nicotine+-1.2.14/pynicotine/config.py.orig 2009-09-27 23:26:45.000000000 +0200
+++ nicotine+-1.2.14/pynicotine/config.py 2010-01-01 23:04:32.438167886 +0100
@@ -289,8 +289,8 @@ class Config:
"trayicon": 1, \
"soundenabled": 1, \
"soundtheme": "", \
- "soundcommand": "play -q", \
- "filemanager": "rox $", \
+ "soundcommand": "Gstreamer (gst-python)", \
+ "filemanager": "xdg-open $", \
"enabletrans": 0, \
"speechenabled": 0, \
"speechprivate": "%(user)s told you.. %(message)s", \
@@ -312,7 +312,7 @@ class Config:
\
"urls":{
"urlcatching":1, \
- "protocols":{"http":"", "https":""}, \
+ "protocols":{"http":"xdg-open \"%s\"", "https":"xdg-open \"%s\""}, \
"humanizeurls":1, \
}, \
\
@@ -328,7 +328,7 @@ class Config:
}, \
\
"players": { \
- "default": "xmms -e $", \
+ "default": "xdg-open $", \
"npothercommand": "", \
"npplayer": "infopipe", \
"npformatlist": [], \
nicotine+-1.2.14-desktop.patch:
nicotine.desktop | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- NEW FILE nicotine+-1.2.14-desktop.patch ---
diff -up nicotine+-1.2.14/files/nicotine.desktop.orig nicotine+-1.2.14/files/nicotine.desktop
--- nicotine+-1.2.14/files/nicotine.desktop.orig 2009-06-04 19:19:03.000000000 +0200
+++ nicotine+-1.2.14/files/nicotine.desktop 2009-12-19 22:30:01.472452957 +0100
@@ -1,10 +1,9 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Nicotine-Plus
Comment=SoulSeek filesharing client
Exec=nicotine.py
-Icon=nicotine-plus-32px.png
+Icon=nicotine-plus-32px
Terminal=false
Type=Application
-Categories=Application;Network;
+Categories=Network;
StartupNotify=true
nicotine+-1.2.14-glade_install.patch:
setup.py | 4 ----
1 file changed, 4 deletions(-)
--- NEW FILE nicotine+-1.2.14-glade_install.patch ---
diff -up nicotine+-1.2.14/setup.py.orig nicotine+-1.2.14/setup.py
--- nicotine+-1.2.14/setup.py.orig 2009-07-31 16:10:05.000000000 +0200
+++ nicotine+-1.2.14/setup.py 2009-12-20 15:50:12.132452957 +0100
@@ -117,10 +117,6 @@ for file in doc_files:
else:
files.append((os.path.join(sys.prefix, "share", "nicotine", "documentation"), [file]))
-# Glade files (GUI)
-glade_files = glob.glob(os.path.join("pynicotine", "gtkgui", "*.glade"))
-files.append((os.path.join("pynicotine", "gtkgui"), glade_files))
-
if __name__ == '__main__' :
from pynicotine.utils import version
LONG_DESCRIPTION = """Nicotine-Plus is a client for SoulSeek filesharing system, forked from Nicotine."""
nicotine+-1.2.14-guide.patch:
frame.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE nicotine+-1.2.14-guide.patch ---
diff -up nicotine+-1.2.14/pynicotine/gtkgui/frame.py.orig nicotine+-1.2.14/pynicotine/gtkgui/frame.py
--- nicotine+-1.2.14/pynicotine/gtkgui/frame.py.orig 2009-10-04 14:46:51.000000000 +0200
+++ nicotine+-1.2.14/pynicotine/gtkgui/frame.py 2010-01-02 21:33:57.762738492 +0100
@@ -2443,8 +2443,8 @@ class NicotineFrame:
winpath = "C:\Program Files\Nicotine+"
paths.append(winpath)
for path in paths:
- if os.path.exists(os.sep.join([path, "doc", file])):
- url = "file:%s/%s/%s" % (urllib.pathname2url(path).replace("|", ":") ,"doc", file)
+ if os.path.exists(os.sep.join([path, file])):
+ url = "file:%s/%s" % (urllib.pathname2url(path).replace("|", ":") ,file)
OpenUri(url)
return
--- NEW FILE nicotine+.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%global alt_name nicotine
%global nicotine_pythonsitedir py%{alt_name}
Name: nicotine+
Version: 1.2.14
Release: 5%{?dist}
Summary: A client for the SoulSeek filesharing network
Group: Applications/Internet
License: GPLv3+
URL: http://www.nicotine-plus.org/
Source0: http://129.125.101.92/%{name}/%{name}-%{version}.tar.bz2
# Prevent .glade files from being installed twice, in a non-standard directory
# (see http://www.nicotine-plus.org/ticket/532)
Patch0: nicotine+-1.2.14-glade_install.patch
# Correct the provided .desktop file (see
# http://lists.nicotine-plus.org/pipermail/nicotine-plus-bugs/2010-January/001868.html)
Patch1: nicotine+-1.2.14-desktop.patch
# Use xdg-open to open files or URLs and GStreamer to play audio effects (see
# http://www.nicotine-plus.org/ticket/538)
Patch2: nicotine+-1.2.14-commands.patch
# Force the application to retrieve the installed guide in the right place (see
# http://www.nicotine-plus.org/ticket/539)
Patch3: nicotine+-1.2.14-guide.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: pygobject2
BuildRequires: python-devel
Requires: gstreamer-python
Requires: notify-python
Requires: pygtk2-libglade
Requires: python-GeoIP
Requires: python-mutagen
Requires: python-sexy
Requires: xdg-utils
BuildArch: noarch
%description
Nicotine+ is a client for the SoulSeek filesharing network. It was "forked" from
Nicotine, Hyriand's Soulseek client, which in turn was forked from the
PySoulSeek project by Alexander Kanavin.
%prep
%setup -q
%patch0 -p1 -b .glade_install
%patch1 -p1 -b .desktop
%patch2 -p1 -b .commands
%patch3 -p1 -b .guide
# Remove shebangs
pushd pynicotine
for file in gtkgui/glade2py.py metadata_mutagen.py mp3.py _testmp3.py upnp.py; do
sed -i.orig -e 1d $file && \
touch -r $file.orig $file && \
rm $file.orig
done
popd
%build
%{__python} setup.py build
%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install \
--skip-build \
--root $RPM_BUILD_ROOT
# Remove useless documentation
rm -f $RPM_BUILD_ROOT%{_datadir}/%{alt_name}/documentation/{BUILD_win32.txt,py2app,README.trayicon}
desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/%{alt_name}.desktop
%find_lang %{alt_name}
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{alt_name}.lang
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/*
%doc %{_datadir}/%{alt_name}/documentation
%{_datadir}/%{alt_name}/sounds
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*.png
%{_mandir}/man1/*.1.gz
%{python_sitelib}/*.egg-info
%{python_sitelib}/%{nicotine_pythonsitedir}
%changelog
* Thu Jan 14 2010 ELMORABITY Mohamed <melmorabity at fedoraproject.org> 1.2.14-5
- Drop no-shebang patch for a sed command
* Sat Jan 2 2010 ELMORABITY Mohamed <melmorabity at fedoraproject.org> 1.2.14-4
- Add nicotine+-1.2.14-guide.patch to force the application to retrieve the
installed guide in the right place
* Fri Jan 1 2010 ELMORABITY Mohamed <melmorabity at fedoraproject.org> 1.2.14-3
- Update nicotine+-1.2.14-commands.patch patch to use GStreamer to play audio
effects
* Fri Jan 1 2010 ELMORABITY Mohamed <melmorabity at fedoraproject.org> 1.2.14-2
- Add nicotine+-1.2.14-commands.patch patch to set xdg-open as the default
program to open files or URLs
- Add therefore Requires on xdg-utils
* Sun Dec 27 2009 ELMORABITY Mohamed <melmorabity at fedoraproject.org> 1.2.14-1
- Initial RPM release
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nicotine+/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 19 Jan 2010 18:31:15 -0000 1.1
+++ .cvsignore 19 Jan 2010 18:41:52 -0000 1.2
@@ -0,0 +1 @@
+nicotine+-1.2.14.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nicotine+/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 19 Jan 2010 18:31:15 -0000 1.1
+++ sources 19 Jan 2010 18:41:52 -0000 1.2
@@ -0,0 +1 @@
+c43dfbd8e759d0228fa9d1e0525cf993 nicotine+-1.2.14.tar.bz2
More information about the scm-commits
mailing list