Login
Log in using an SSO provider:
Fedora Account System
Red Hat Associate
Red Hat Customer
Login using a Red Hat Bugzilla account
Forgot Password
Create an Account
Red Hat Bugzilla – Attachment 533244 Details for
Bug 753364
Please upgrade nautilus-python to 1.1
Home
New
Search
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh92 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
[?]
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
Patch to update the RPM package to 1.1
0001-Update-to-1.1.patch (text/plain), 15.81 KB, created by
Łukasz Jernaś
on 2011-11-12 13:14:00 UTC
(
hide
)
Description:
Patch to update the RPM package to 1.1
Filename:
MIME Type:
Creator:
Łukasz Jernaś
Created:
2011-11-12 13:14:00 UTC
Size:
15.81 KB
patch
obsolete
>From fbcc093b931bc5a39c3b2854cbfabf687e131ef5 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?=C5=81ukasz=20Jerna=C5=9B?= <deejay1@srem.org> >Date: Sat, 12 Nov 2011 14:09:47 +0100 >Subject: [PATCH] Update to 1.1 Remove all patches as they are applied > upstream > >--- > ...53169-Update-the-COPYING-file-with-the-mo.patch | 133 -------------------- > 0002-Fixes-bug-652032.patch | 23 ---- > 0003-Fix-html-doc-installation-location.patch | 24 ---- > 0004-Fix-underquoted-macro-warning.patch | 25 ---- > 0005-Use-autoconf-s-variable.patch | 36 ------ > 0006-Add-I-m4-to-top-Makefile.am.patch | 22 ---- > 0007-Fix-fsf-address.patch | 25 ---- > nautilus-python.spec | 29 +---- > sources | 2 +- > 9 files changed, 7 insertions(+), 312 deletions(-) > delete mode 100644 0001-Fixes-bug-653169-Update-the-COPYING-file-with-the-mo.patch > delete mode 100644 0002-Fixes-bug-652032.patch > delete mode 100644 0003-Fix-html-doc-installation-location.patch > delete mode 100644 0004-Fix-underquoted-macro-warning.patch > delete mode 100644 0005-Use-autoconf-s-variable.patch > delete mode 100644 0006-Add-I-m4-to-top-Makefile.am.patch > delete mode 100644 0007-Fix-fsf-address.patch > >diff --git a/0001-Fixes-bug-653169-Update-the-COPYING-file-with-the-mo.patch b/0001-Fixes-bug-653169-Update-the-COPYING-file-with-the-mo.patch >deleted file mode 100644 >index ac5724a..0000000 >--- a/0001-Fixes-bug-653169-Update-the-COPYING-file-with-the-mo.patch >+++ /dev/null >@@ -1,133 +0,0 @@ >-From 3407e6b3e1a851ed059e74a71040e84d9a473831 Mon Sep 17 00:00:00 2001 >-From: Adam Plumb <adamplumb@gmail.com> >-Date: Sun, 26 Jun 2011 09:07:06 -0400 >-Subject: [PATCH 1/6] Fixes bug #653169, Update the COPYING file with the most >- recent GPLv2 license >- >---- >- COPYING | 41 ++++++++++++++++++++--------------------- >- 1 files changed, 20 insertions(+), 21 deletions(-) >- >-diff --git a/COPYING b/COPYING >-index d60c31a..d159169 100644 >---- a/COPYING >-+++ b/COPYING >-@@ -1,12 +1,12 @@ >-- GNU GENERAL PUBLIC LICENSE >-- Version 2, June 1991 >-+ GNU GENERAL PUBLIC LICENSE >-+ Version 2, June 1991 >- >-- Copyright (C) 1989, 1991 Free Software Foundation, Inc. >-- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA >-+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., >-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA >- Everyone is permitted to copy and distribute verbatim copies >- of this license document, but changing it is not allowed. >- >-- Preamble >-+ Preamble >- >- The licenses for most software are designed to take away your >- freedom to share and change it. By contrast, the GNU General Public >-@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This >- General Public License applies to most of the Free Software >- Foundation's software and to any other program whose authors commit to >- using it. (Some other Free Software Foundation software is covered by >--the GNU Library General Public License instead.) You can apply it to >-+the GNU Lesser General Public License instead.) You can apply it to >- your programs, too. >- >- When we speak of free software, we are referring to freedom, not >-@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. >- >- The precise terms and conditions for copying, distribution and >- modification follow. >-- >-- GNU GENERAL PUBLIC LICENSE >-+ >-+ GNU GENERAL PUBLIC LICENSE >- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION >- >- 0. This License applies to any program or other work which contains >-@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: >- License. (Exception: if the Program itself is interactive but >- does not normally print such an announcement, your work based on >- the Program is not required to print an announcement.) >-- >-+ >- These requirements apply to the modified work as a whole. If >- identifiable sections of that work are not derived from the Program, >- and can be reasonably considered independent and separate works in >-@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent >- access to copy the source code from the same place counts as >- distribution of the source code, even though third parties are not >- compelled to copy the source along with the object code. >-- >-+ >- 4. You may not copy, modify, sublicense, or distribute the Program >- except as expressly provided under this License. Any attempt >- otherwise to copy, modify, sublicense or distribute the Program is >-@@ -225,7 +225,7 @@ impose that choice. >- >- This section is intended to make thoroughly clear what is believed to >- be a consequence of the rest of this License. >-- >-+ >- 8. If the distribution and/or use of the Program is restricted in >- certain countries either by patents or by copyrighted interfaces, the >- original copyright holder who places the Program under this License >-@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals >- of preserving the free status of all derivatives of our free software and >- of promoting the sharing and reuse of software generally. >- >-- NO WARRANTY >-+ NO WARRANTY >- >- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY >- FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN >-@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER >- PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE >- POSSIBILITY OF SUCH DAMAGES. >- >-- END OF TERMS AND CONDITIONS >-- >-- How to Apply These Terms to Your New Programs >-+ END OF TERMS AND CONDITIONS >-+ >-+ How to Apply These Terms to Your New Programs >- >- If you develop a new program, and you want it to be of the greatest >- possible use to the public, the best way to achieve this is to make it >-@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. >- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >- GNU General Public License for more details. >- >-- You should have received a copy of the GNU General Public License >-- along with this program; if not, write to the Free Software >-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA >-- >-+ You should have received a copy of the GNU General Public License along >-+ with this program; if not, write to the Free Software Foundation, Inc., >-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. >- >- Also add information on how to contact you by electronic and paper mail. >- >- If the program is interactive, make it output a short notice like this >- when it starts in an interactive mode: >- >-- Gnomovision version 69, Copyright (C) year name of author >-+ Gnomovision version 69, Copyright (C) year name of author >- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. >- This is free software, and you are welcome to redistribute it >- under certain conditions; type `show c' for details. >-@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: >- This General Public License does not permit incorporating your program into >- proprietary programs. If your program is a subroutine library, you may >- consider it more useful to permit linking proprietary applications with the >--library. If this is what you want to do, use the GNU Library General >-+library. If this is what you want to do, use the GNU Lesser General >- Public License instead of this License. >--- >-1.7.6.4 >- >diff --git a/0002-Fixes-bug-652032.patch b/0002-Fixes-bug-652032.patch >deleted file mode 100644 >index 0019232..0000000 >--- a/0002-Fixes-bug-652032.patch >+++ /dev/null >@@ -1,23 +0,0 @@ >-From 58f061b6ecadb8f55f2e88a5fe6cce18113a3428 Mon Sep 17 00:00:00 2001 >-From: Adam Plumb <adamplumb@gmail.com> >-Date: Mon, 27 Jun 2011 12:50:41 -0500 >-Subject: [PATCH 2/6] Fixes bug #652032 Update the pythondir variable in the >- nautilus-python.pc.in file. >- >---- >- nautilus-python.pc.in | 2 +- >- 1 files changed, 1 insertions(+), 1 deletions(-) >- >-diff --git a/nautilus-python.pc.in b/nautilus-python.pc.in >-index f73fbb0..8a43f0e 100644 >---- a/nautilus-python.pc.in >-+++ b/nautilus-python.pc.in >-@@ -4,4 +4,4 @@ Version: @VERSION@ >- >- prefix=@prefix@ >- libdir=${prefix}/lib >--pythondir=@NAUTILUS_EXTENSION_DIR@/python >-+pythondir=@datadir@/nautilus-python/extensions >--- >-1.7.6.4 >- >diff --git a/0003-Fix-html-doc-installation-location.patch b/0003-Fix-html-doc-installation-location.patch >deleted file mode 100644 >index 8b578c0..0000000 >--- a/0003-Fix-html-doc-installation-location.patch >+++ /dev/null >@@ -1,24 +0,0 @@ >-From a76bba7ea9d1be82ae43cae2c1ea839a2708925d Mon Sep 17 00:00:00 2001 >-From: Hicham HAOUARI <hicham.haouari@gmail.com> >-Date: Tue, 27 Sep 2011 18:02:46 +0000 >-Subject: [PATCH 3/6] Fix html doc installation location >- >---- >- docs/Makefile.am | 1 + >- 1 files changed, 1 insertions(+), 0 deletions(-) >- >-diff --git a/docs/Makefile.am b/docs/Makefile.am >-index 12bd1a2..1f73cbc 100644 >---- a/docs/Makefile.am >-+++ b/docs/Makefile.am >-@@ -48,6 +48,7 @@ HTMLFILES = \ >- html/nautilus-python-enum-reference.html \ >- html/enum-nautilus-python-operation-result.html \ >- html/nautilus-python.devhelp >-+HTML_DATA = $(HTMLFILES) >- >- CSS_FILES = $(PYGOBJECT_PYGDOCS)/style.css >- CSSdir = $(HTMLdir) >--- >-1.7.6.4 >- >diff --git a/0004-Fix-underquoted-macro-warning.patch b/0004-Fix-underquoted-macro-warning.patch >deleted file mode 100644 >index 58430e9..0000000 >--- a/0004-Fix-underquoted-macro-warning.patch >+++ /dev/null >@@ -1,25 +0,0 @@ >-From 023e60f01d1c7b4f4e186308060b598e1473238f Mon Sep 17 00:00:00 2001 >-From: Hicham HAOUARI <hicham.haouari@gmail.com> >-Date: Tue, 27 Sep 2011 18:05:38 +0000 >-Subject: [PATCH 4/6] Fix underquoted macro warning >- >---- >- m4/python.m4 | 2 +- >- 1 files changed, 1 insertions(+), 1 deletions(-) >- >-diff --git a/m4/python.m4 b/m4/python.m4 >-index 18685f1..c61a0d3 100644 >---- a/m4/python.m4 >-+++ b/m4/python.m4 >-@@ -1,7 +1,7 @@ >- ## this one is commonly used with AM_PATH_PYTHONDIR ... >- dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) >- dnl Check if a module containing a given symbol is visible to python. >--AC_DEFUN(AM_CHECK_PYMOD, >-+AC_DEFUN([AM_CHECK_PYMOD], >- [AC_REQUIRE([AM_PATH_PYTHON]) >- py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` >- AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) >--- >-1.7.6.4 >- >diff --git a/0005-Use-autoconf-s-variable.patch b/0005-Use-autoconf-s-variable.patch >deleted file mode 100644 >index 80080a1..0000000 >--- a/0005-Use-autoconf-s-variable.patch >+++ /dev/null >@@ -1,36 +0,0 @@ >-From 463aca8190dea99d321ea3faf38a2e330b546e50 Mon Sep 17 00:00:00 2001 >-From: Hicham HAOUARI <hicham.haouari@gmail.com> >-Date: Tue, 27 Sep 2011 19:01:51 +0000 >-Subject: [PATCH 5/6] Use autoconf's variable >- >---- >- configure.in | 1 + >- examples/Makefile.am | 4 ++-- >- 2 files changed, 3 insertions(+), 2 deletions(-) >- >-diff --git a/configure.in b/configure.in >-index 407b0c5..9ea04f9 100644 >---- a/configure.in >-+++ b/configure.in >-@@ -1,3 +1,4 @@ >-+AC_PREREQ(2.60) >- AC_INIT >- >- PACKAGE=nautilus-python >-diff --git a/examples/Makefile.am b/examples/Makefile.am >-index 45e8909..b2a5903 100644 >---- a/examples/Makefile.am >-+++ b/examples/Makefile.am >-@@ -1,7 +1,7 @@ >--docsdir = $(datadir)/doc/$(PACKAGE) >-+docsdir = $(docdir) >- docs_DATA = README >- >--examplesdir = $(datadir)/doc/$(PACKAGE)/examples >-+examplesdir = $(docdir)/examples >- examples_DATA = \ >- background-image.py \ >- block-size-column.py \ >--- >-1.7.6.4 >- >diff --git a/0006-Add-I-m4-to-top-Makefile.am.patch b/0006-Add-I-m4-to-top-Makefile.am.patch >deleted file mode 100644 >index 2c191d4..0000000 >--- a/0006-Add-I-m4-to-top-Makefile.am.patch >+++ /dev/null >@@ -1,22 +0,0 @@ >-From f7c12f909be2caf3235397f9178c594e5fdc76b1 Mon Sep 17 00:00:00 2001 >-From: Hicham HAOUARI <hicham.haouari@gmail.com> >-Date: Tue, 27 Sep 2011 19:03:10 +0000 >-Subject: [PATCH 6/6] Add '-I m4' to top Makefile.am >- >---- >- Makefile.am | 2 ++ >- 1 files changed, 2 insertions(+), 0 deletions(-) >- >-diff --git a/Makefile.am b/Makefile.am >-index 2afeb5f..144e7d2 100644 >---- a/Makefile.am >-+++ b/Makefile.am >-@@ -1,3 +1,5 @@ >-+ACLOCAL_AMFLAGS = -I m4 >-+ >- SUBDIRS = src examples >- >- if ENABLE_GTK_DOC >--- >-1.7.6.4 >- >diff --git a/0007-Fix-fsf-address.patch b/0007-Fix-fsf-address.patch >deleted file mode 100644 >index aa142a0..0000000 >--- a/0007-Fix-fsf-address.patch >+++ /dev/null >@@ -1,25 +0,0 @@ >-From f35a3f210999328e5fa7ee025271a53b13d7822e Mon Sep 17 00:00:00 2001 >-From: Hicham HAOUARI <hicham.haouari@gmail.com> >-Date: Tue, 27 Sep 2011 20:36:33 +0000 >-Subject: [PATCH 7/7] Fix fsf address >- >---- >- src/nautilus-python.c | 2 +- >- 1 files changed, 1 insertions(+), 1 deletions(-) >- >-diff --git a/src/nautilus-python.c b/src/nautilus-python.c >-index 0e00285..1bcfc9f 100644 >---- a/src/nautilus-python.c >-+++ b/src/nautilus-python.c >-@@ -14,7 +14,7 @@ >- * >- * You should have received a copy of the GNU General Public License >- * along with this program; if not, write to the Free Software >-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. >-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. >- */ >- >- #ifdef HAVE_CONFIG_H >--- >-1.7.6.4 >- >diff --git a/nautilus-python.spec b/nautilus-python.spec >index cae5c13..ef511af 100644 >--- a/nautilus-python.spec >+++ b/nautilus-python.spec >@@ -1,7 +1,7 @@ > %global NAUTILUS_MAYOR_VER 3.0 > > Name: nautilus-python >-Version: 1.0 >+Version: 1.1 > Release: 1%{?dist} > Summary: Python bindings for Nautilus > >@@ -12,26 +12,12 @@ Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name > > BuildRequires: python-devel > BuildRequires: nautilus-devel >-BuildRequires: pygobject2-devel >+BuildRequires: pygobject3-devel > BuildRequires: gtk-doc > BuildRequires: autoconf automake libtool > > Requires: nautilus >= 3.0 > >-# Patch0: https://bugzilla.gnome.org/show_bug.cgi?id=653169 >-Patch0: 0001-Fixes-bug-653169-Update-the-COPYING-file-with-the-mo.patch >-# Patch1: https://bugzilla.gnome.org/show_bug.cgi?id=652032 >-Patch1: 0002-Fixes-bug-652032.patch >-# Patch2: https://bugzilla.gnome.org/show_bug.cgi?id=660283 >-Patch2: 0003-Fix-html-doc-installation-location.patch >-# Patch3: https://bugzilla.gnome.org/show_bug.cgi?id=660286 >-Patch3: 0004-Fix-underquoted-macro-warning.patch >-# Patch4: https://bugzilla.gnome.org/show_bug.cgi?id=660287 >-Patch4: 0005-Use-autoconf-s-variable.patch >-# Patch5: https://bugzilla.gnome.org/show_bug.cgi?id=660288 >-Patch5: 0006-Add-I-m4-to-top-Makefile.am.patch >-# Patch6: https://bugzilla.gnome.org/show_bug.cgi?id=660290 >-Patch6: 0007-Fix-fsf-address.patch > > %description > Python bindings for Nautilus >@@ -50,13 +36,6 @@ Python bindings for Nautilus > %prep > %setup -q > find m4 -type f -not -name 'python.m4' -delete >-%patch0 -p1 -b .update-licence >-%patch1 -p1 -b .bug-652032 >-%patch2 -p1 -b .fix-html-doc >-%patch3 -p1 -b .underquoted-macro-warning >-%patch4 -p1 -b .use-docdir-variable >-%patch5 -p1 -b .add-I-m4 >-%patch6 -p1 -b .fix-fsf-address > autoreconf -if -I m4 > > %build >@@ -91,6 +70,10 @@ find $RPM_BUILD_ROOT -name '*.la' -delete > > > %changelog >+* Sat Nov 12 2011 Åukasz Jernas <deejay1@srem.org> - 1.1-1 >+- Update to 1.1 >+- Remove all patches as they are applied upstream >+ > * Tue Sep 27 2011 Hicham HAOUARI <hicham.haouari@gmail.com> - 1.0-1 > - Update to 1.0 > - Remove BuildRoot tag and %%clean section >diff --git a/sources b/sources >index c2e51ad..10577ef 100644 >--- a/sources >+++ b/sources >@@ -1 +1 @@ >-64ceb67b6b167c2d17ac46f23ec70828 nautilus-python-1.0.tar.bz2 >+b32ebf22e8d60b04337b13047be8326b nautilus-python-1.1.tar.bz2 >-- >1.7.7.3 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 753364
: 533244