[python-fastimport] cleaned up spec patch for outdated FSF address
Dan Callaghan
dcallagh at fedoraproject.org
Fri Oct 14 00:22:25 UTC 2011
commit ca3d81d4734fc8454e5f4ee393237a5b5ef06501
Author: Dan Callaghan <dcallagh at redhat.com>
Date: Thu Oct 6 09:45:21 2011 +1000
cleaned up spec
patch for outdated FSF address
python-fastimport-fsf-address.patch | 248 +++++++++++++++++++++++++++++++++++
python-fastimport.spec | 14 +-
2 files changed, 256 insertions(+), 6 deletions(-)
---
diff --git a/python-fastimport-fsf-address.patch b/python-fastimport-fsf-address.patch
new file mode 100644
index 0000000..6b47365
--- /dev/null
+++ b/python-fastimport-fsf-address.patch
@@ -0,0 +1,248 @@
+diff -ur python-fastimport-0.9.0.orig/fastimport/commands.py python-fastimport-0.9.0/fastimport/commands.py
+--- python-fastimport-0.9.0.orig/fastimport/commands.py 2011-01-31 10:41:31.000000000 +1000
++++ python-fastimport-0.9.0/fastimport/commands.py 2011-10-06 09:35:09.779595115 +1000
+@@ -11,8 +11,7 @@
+ # 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
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Import command classes."""
+
+diff -ur python-fastimport-0.9.0.orig/fastimport/dates.py python-fastimport-0.9.0/fastimport/dates.py
+--- python-fastimport-0.9.0.orig/fastimport/dates.py 2011-01-31 10:41:31.000000000 +1000
++++ python-fastimport-0.9.0/fastimport/dates.py 2011-10-06 09:35:12.393652617 +1000
+@@ -11,8 +11,7 @@
+ # 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
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Date parsing routines.
+
+diff -ur python-fastimport-0.9.0.orig/fastimport/errors.py python-fastimport-0.9.0/fastimport/errors.py
+--- python-fastimport-0.9.0.orig/fastimport/errors.py 2011-01-31 10:41:31.000000000 +1000
++++ python-fastimport-0.9.0/fastimport/errors.py 2011-10-06 09:35:16.447741791 +1000
+@@ -11,8 +11,7 @@
+ # 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
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Exception classes for fastimport"""
+
+diff -ur python-fastimport-0.9.0.orig/fastimport/helpers.py python-fastimport-0.9.0/fastimport/helpers.py
+--- python-fastimport-0.9.0.orig/fastimport/helpers.py 2011-01-31 10:41:31.000000000 +1000
++++ python-fastimport-0.9.0/fastimport/helpers.py 2011-10-06 09:35:19.328805164 +1000
+@@ -11,8 +11,7 @@
+ # 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
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Miscellaneous useful stuff."""
+
+diff -ur python-fastimport-0.9.0.orig/fastimport/idmapfile.py python-fastimport-0.9.0/fastimport/idmapfile.py
+--- python-fastimport-0.9.0.orig/fastimport/idmapfile.py 2011-01-31 10:41:31.000000000 +1000
++++ python-fastimport-0.9.0/fastimport/idmapfile.py 2011-10-06 09:35:21.309848739 +1000
+@@ -11,8 +11,7 @@
+ # 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
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Routines for saving and loading the id-map file."""
+
+diff -ur python-fastimport-0.9.0.orig/fastimport/__init__.py python-fastimport-0.9.0/fastimport/__init__.py
+--- python-fastimport-0.9.0.orig/fastimport/__init__.py 2011-01-31 10:41:31.000000000 +1000
++++ python-fastimport-0.9.0/fastimport/__init__.py 2011-10-06 09:35:07.740550267 +1000
+@@ -11,8 +11,7 @@
+ # 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
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Fastimport streams."""
+
+diff -ur python-fastimport-0.9.0.orig/fastimport/parser.py python-fastimport-0.9.0/fastimport/parser.py
+--- python-fastimport-0.9.0.orig/fastimport/parser.py 2011-01-31 10:41:31.000000000 +1000
++++ python-fastimport-0.9.0/fastimport/parser.py 2011-10-06 09:35:23.623899641 +1000
+@@ -11,8 +11,7 @@
+ # 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
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Parser of import data into command objects.
+
+diff -ur python-fastimport-0.9.0.orig/fastimport/processor.py python-fastimport-0.9.0/fastimport/processor.py
+--- python-fastimport-0.9.0.orig/fastimport/processor.py 2011-01-31 10:41:31.000000000 +1000
++++ python-fastimport-0.9.0/fastimport/processor.py 2011-10-06 09:35:25.746946339 +1000
+@@ -11,8 +11,7 @@
+ # 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
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Processor of import commands.
+
+diff -ur python-fastimport-0.9.0.orig/fastimport/processors/filter_processor.py python-fastimport-0.9.0/fastimport/processors/filter_processor.py
+--- python-fastimport-0.9.0.orig/fastimport/processors/filter_processor.py 2011-01-31 10:41:31.000000000 +1000
++++ python-fastimport-0.9.0/fastimport/processors/filter_processor.py 2011-10-06 09:35:28.262001662 +1000
+@@ -11,8 +11,7 @@
+ # 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
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Import processor that filters the input (and doesn't import)."""
+
+diff -ur python-fastimport-0.9.0.orig/fastimport/processors/info_processor.py python-fastimport-0.9.0/fastimport/processors/info_processor.py
+--- python-fastimport-0.9.0.orig/fastimport/processors/info_processor.py 2011-01-31 10:41:31.000000000 +1000
++++ python-fastimport-0.9.0/fastimport/processors/info_processor.py 2011-10-06 09:35:32.274089913 +1000
+@@ -11,8 +11,7 @@
+ # 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
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Import processor that dump stats about the input (and doesn't import)."""
+
+diff -ur python-fastimport-0.9.0.orig/fastimport/processors/query_processor.py python-fastimport-0.9.0/fastimport/processors/query_processor.py
+--- python-fastimport-0.9.0.orig/fastimport/processors/query_processor.py 2011-01-31 10:41:31.000000000 +1000
++++ python-fastimport-0.9.0/fastimport/processors/query_processor.py 2011-10-06 09:35:34.147131111 +1000
+@@ -11,8 +11,7 @@
+ # 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
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Import processor that queries the input (and doesn't import)."""
+
+diff -ur python-fastimport-0.9.0.orig/fastimport/reftracker.py python-fastimport-0.9.0/fastimport/reftracker.py
+--- python-fastimport-0.9.0.orig/fastimport/reftracker.py 2011-01-31 10:41:31.000000000 +1000
++++ python-fastimport-0.9.0/fastimport/reftracker.py 2011-10-06 09:35:36.562184236 +1000
+@@ -11,8 +11,7 @@
+ # 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
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+ """Tracker of refs."""
+diff -ur python-fastimport-0.9.0.orig/fastimport/tests/__init__.py python-fastimport-0.9.0/fastimport/tests/__init__.py
+--- python-fastimport-0.9.0.orig/fastimport/tests/__init__.py 2011-01-31 10:41:31.000000000 +1000
++++ python-fastimport-0.9.0/fastimport/tests/__init__.py 2011-10-06 09:34:52.739220292 +1000
+@@ -13,9 +13,7 @@
+ # 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., 51 Franklin Street, Fifth Floor, Boston,
+-# MA 02110-1301, USA.
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Tests for fastimport."""
+
+diff -ur python-fastimport-0.9.0.orig/fastimport/tests/test_commands.py python-fastimport-0.9.0/fastimport/tests/test_commands.py
+--- python-fastimport-0.9.0.orig/fastimport/tests/test_commands.py 2011-01-31 10:41:31.000000000 +1000
++++ python-fastimport-0.9.0/fastimport/tests/test_commands.py 2011-10-06 09:35:38.635229835 +1000
+@@ -11,8 +11,7 @@
+ # 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
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Test how Commands are displayed"""
+
+diff -ur python-fastimport-0.9.0.orig/fastimport/tests/test_errors.py python-fastimport-0.9.0/fastimport/tests/test_errors.py
+--- python-fastimport-0.9.0.orig/fastimport/tests/test_errors.py 2011-01-31 10:41:31.000000000 +1000
++++ python-fastimport-0.9.0/fastimport/tests/test_errors.py 2011-10-06 09:35:40.941280560 +1000
+@@ -11,8 +11,7 @@
+ # 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
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Test the Import errors"""
+
+diff -ur python-fastimport-0.9.0.orig/fastimport/tests/test_filter_processor.py python-fastimport-0.9.0/fastimport/tests/test_filter_processor.py
+--- python-fastimport-0.9.0.orig/fastimport/tests/test_filter_processor.py 2011-01-31 10:41:31.000000000 +1000
++++ python-fastimport-0.9.0/fastimport/tests/test_filter_processor.py 2011-10-06 09:35:45.185373913 +1000
+@@ -11,8 +11,7 @@
+ # 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
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Test FilterProcessor"""
+
+diff -ur python-fastimport-0.9.0.orig/fastimport/tests/test_head_tracking.py python-fastimport-0.9.0/fastimport/tests/test_head_tracking.py
+--- python-fastimport-0.9.0.orig/fastimport/tests/test_head_tracking.py 2011-01-31 10:41:31.000000000 +1000
++++ python-fastimport-0.9.0/fastimport/tests/test_head_tracking.py 2011-10-06 09:35:47.524425363 +1000
+@@ -11,8 +11,7 @@
+ # 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
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Test tracking of heads"""
+
+diff -ur python-fastimport-0.9.0.orig/fastimport/tests/test_helpers.py python-fastimport-0.9.0/fastimport/tests/test_helpers.py
+--- python-fastimport-0.9.0.orig/fastimport/tests/test_helpers.py 2011-01-31 10:41:31.000000000 +1000
++++ python-fastimport-0.9.0/fastimport/tests/test_helpers.py 2011-10-06 09:35:51.012502089 +1000
+@@ -11,8 +11,7 @@
+ # 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
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Test the helper functions."""
+
+diff -ur python-fastimport-0.9.0.orig/fastimport/tests/test_parser.py python-fastimport-0.9.0/fastimport/tests/test_parser.py
+--- python-fastimport-0.9.0.orig/fastimport/tests/test_parser.py 2011-01-31 10:41:31.000000000 +1000
++++ python-fastimport-0.9.0/fastimport/tests/test_parser.py 2011-10-06 09:35:56.858630682 +1000
+@@ -11,8 +11,7 @@
+ # 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
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ """Test the Import parsing"""
+
diff --git a/python-fastimport.spec b/python-fastimport.spec
index 27f655e..e75a018 100644
--- a/python-fastimport.spec
+++ b/python-fastimport.spec
@@ -1,11 +1,13 @@
Name: python-fastimport
Version: 0.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Python parser for fastimport (VCS interchange format)
Group: Development/Languages
License: GPLv2+
URL: https://launchpad.net/python-fastimport
Source0: http://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}.tar.gz
+# https://bugs.launchpad.net/python-fastimport/+bug/868800
+Patch0: %{name}-fsf-address.patch
BuildArch: noarch
BuildRequires: python-setuptools-devel
BuildRequires: python-testtools
@@ -17,25 +19,25 @@ extracted so it can be used by other projects.
%prep
%setup -q
+%patch0 -p1 -b .fsf-address
%build
%{__python} setup.py build
%install
-rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
%check
PYTHONPATH=$RPM_BUILD_ROOT%{python_sitelib} nosetests fastimport
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(-,root,root,-)
%doc AUTHORS COPYING.txt
%{python_sitelib}/fastimport*
%changelog
+* Thu Oct 06 2011 Dan Callaghan <dcallagh at redhat.com> - 0.9.0-2
+- cleaned up spec
+- patch for outdated FSF address
+
* Thu Jun 16 2011 Dan Callaghan <dcallagh at redhat.com> - 0.9.0-1
- initial version
More information about the scm-commits
mailing list