rpms/nicotine+/devel nicotine+-1.2.15-urls_commands.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 nicotine+.spec, 1.3, 1.4 sources, 1.2, 1.3 nicotine+-1.2.14-commands.patch, 1.1, NONE nicotine+-1.2.14-desktop.patch, 1.1, NONE nicotine+-1.2.14-glade_install.patch, 1.1, NONE nicotine+-1.2.14-guide.patch, 1.1, NONE
Mohamed ElMorabity
melmorabity at fedoraproject.org
Fri Feb 19 23:58:51 UTC 2010
Author: melmorabity
Update of /cvs/pkgs/rpms/nicotine+/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12215/devel
Modified Files:
.cvsignore import.log nicotine+.spec sources
Added Files:
nicotine+-1.2.15-urls_commands.patch
Removed Files:
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
Log Message:
- Update to 1.2.15
- Drop nicotine+-1.2.14-glade_install.patch / nicotine+-1.2.14-desktop.patch /
nicotine+-1.2.14-commands.patch / nicotine+-1.2.14-guide.patch patches (merged
upstream)
- Add nicotine+-1.2.15-urls_commands.patch to set xdg-open as the default
program to open URLS
- Update .spec from new Python guidelines
nicotine+-1.2.15-urls_commands.patch:
config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE nicotine+-1.2.15-urls_commands.patch ---
diff -up nicotine+-1.2.15/pynicotine/config.py.orig nicotine+-1.2.15/pynicotine/config.py
--- nicotine+-1.2.15/pynicotine/config.py.orig 2010-02-16 17:36:45.000000000 +0100
+++ nicotine+-1.2.15/pynicotine/config.py 2010-02-20 00:29:31.290438019 +0100
@@ -318,7 +318,7 @@ class Config:
\
"urls":{
"urlcatching":1, \
- "protocols":{"http":"", "https":""}, \
+ "protocols":{"http":"xdg-open \"%s\"", "https":"dg-open \"%s\""}, \
"humanizeurls":1, \
}, \
\
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nicotine+/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 19 Jan 2010 18:41:52 -0000 1.2
+++ .cvsignore 19 Feb 2010 23:58:51 -0000 1.3
@@ -1 +1 @@
-nicotine+-1.2.14.tar.bz2
+nicotine+-1.2.15.tar.bz2
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nicotine+/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 19 Jan 2010 18:41:52 -0000 1.1
+++ import.log 19 Feb 2010 23:58:51 -0000 1.2
@@ -1 +1,2 @@
nicotine+-1_2_14-5_fc12:HEAD:nicotine+-1.2.14-5.fc12.src.rpm:1263926290
+nicotine+-1_2_15-1_fc12:HEAD:nicotine+-1.2.15-1.fc12.src.rpm:1266623906
Index: nicotine+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nicotine+/devel/nicotine+.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- nicotine+.spec 25 Jan 2010 12:39:55 -0000 1.3
+++ nicotine+.spec 19 Feb 2010 23:58:51 -0000 1.4
@@ -1,35 +1,27 @@
+%if ! (0%{?fedora} > 12)
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%endif
%global alt_name nicotine
%global nicotine_pythonsitedir py%{alt_name}
Name: nicotine+
-Version: 1.2.14
-Release: 6%{?dist}
+Version: 1.2.15
+Release: 1%{?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
+# Use xdg-open to open URLs
+Patch0: nicotine+-1.2.15-urls_commands.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: pygobject2
-BuildRequires: python-devel
+BuildRequires: python2-devel
Requires: gstreamer-python
Requires: notify-python
Requires: pygtk2-libglade
@@ -47,10 +39,7 @@ 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
+%patch0 -p1 -b .urls_commands
# Remove shebangs
pushd pynicotine
@@ -100,8 +89,17 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Feb 20 2010 LMORABITY Mohamed <melmorabity at fedoraproject.org> 1.2.15-1
+- Update to 1.2.15
+- Drop nicotine+-1.2.14-glade_install.patch / nicotine+-1.2.14-desktop.patch /
+ nicotine+-1.2.14-commands.patch / nicotine+-1.2.14-guide.patch patches (merged
+ upstream)
+- Add nicotine+-1.2.15-urls_commands.patch to set xdg-open as the default
+ program to open URLS
+- Update .spec from new Python guidelines
+
* Mon Jan 25 2010 ELMORABITY Mohamed <melmorabity at fedoraproject.org> 1.2.14-6
-- Own directory %{_datadir}/%{alt_name}
+- Own directory %%{_datadir}/%%{alt_name}
* Thu Jan 14 2010 ELMORABITY Mohamed <melmorabity at fedoraproject.org> 1.2.14-5
- Drop no-shebang patch for a sed command
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nicotine+/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 19 Jan 2010 18:41:52 -0000 1.2
+++ sources 19 Feb 2010 23:58:51 -0000 1.3
@@ -1 +1 @@
-c43dfbd8e759d0228fa9d1e0525cf993 nicotine+-1.2.14.tar.bz2
+05dbaa15f51509f376833dfb0ad4e8ad nicotine+-1.2.15.tar.bz2
--- nicotine+-1.2.14-commands.patch DELETED ---
--- nicotine+-1.2.14-desktop.patch DELETED ---
--- nicotine+-1.2.14-glade_install.patch DELETED ---
--- nicotine+-1.2.14-guide.patch DELETED ---
More information about the scm-commits
mailing list