[packages/python-pyblock] up to 0.53, all patches outdated

glen glen at pld-linux.org
Thu May 16 08:51:07 CEST 2013


commit 4f0cc362fcfafcd936513bcd8d7c5d1416638048
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu May 16 09:50:47 2013 +0300

    up to 0.53, all patches outdated

 python-pyblock-ULLLLLL.patch  | 14 --------------
 python-pyblock-fix.patch      | 20 --------------------
 python-pyblock-optflags.patch | 11 -----------
 python-pyblock.spec           | 39 +++++++++++++++++++--------------------
 4 files changed, 19 insertions(+), 65 deletions(-)
---
diff --git a/python-pyblock.spec b/python-pyblock.spec
index bde17c0..2fa2d33 100644
--- a/python-pyblock.spec
+++ b/python-pyblock.spec
@@ -1,23 +1,24 @@
-%define realname pyblock
+%define	dmrver	1.0.0-0.rc15
+%define	dmver	1.02.54-3
+%define	module	pyblock
 Summary:	Python modules for dealing with block devices
 Summary(pl.UTF-8):	Moduły Pythona do obsługi urządzeń blokowych
-Name:		python-%{realname}
-Version:	0.32
-Release:	3
-License:	GPL
+Name:		python-%{module}
+Version:	0.53
+Release:	1
+License:	GPL v2 or GPL v3
 Group:		Libraries/Python
-# https://fedorahosted.org/releases/p/y/pyblock/ (not yet)
-Source0:	%{realname}-%{version}.tar.bz2
-# Source0-md5:	339b06ac1eb48dde8a54fbb2e174b26b
-Patch0:		%{name}-ULLLLLL.patch
-Patch1:		%{name}-optflags.patch
-Patch2:		%{name}-fix.patch
-BuildRequires:	device-mapper-devel >= 1.02.05-0.3
-BuildRequires:	dmraid-devel >= 1.0.0-0.rc15.1
+Source0:	https://fedorahosted.org/releases/p/y/pyblock/pyblock-%{version}.tar.bz2
+# Source0-md5:	f6d33a8362dee358517d0a9e2ebdd044
+URL:		http://fedoraproject.org/wiki/Anaconda
+BuildRequires:	device-mapper-devel >= %{dmver}
+BuildRequires:	dmraid-devel >= %{dmrver}
+BuildRequires:	gettext
 BuildRequires:	libselinux-devel
+BuildRequires:	libsepol-devel
 BuildRequires:	python-devel
-Requires:	device-mapper >= 1.02.02
-ExcludeArch:	s390 s390x
+Requires:	device-mapper >= %{dmver}
+Requires:	python-parted
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags	-fno-strict-aliasing
@@ -29,10 +30,7 @@ The pyblock contains Python modules for dealing with block devices.
 Pakiet pyblock zawiera moduły Pythona do obsługi urządzeń blokowych.
 
 %prep
-%setup -q -n %{realname}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%setup -q -n %{module}-%{version}
 
 %build
 %{__make} -j1 \
@@ -41,11 +39,12 @@ Pakiet pyblock zawiera moduły Pythona do obsługi urządzeń blokowych.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	SITELIB=%{py_sitedir}
 
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{module}-%{version}
+
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
diff --git a/python-pyblock-ULLLLLL.patch b/python-pyblock-ULLLLLL.patch
deleted file mode 100644
index 277ffbd..0000000
--- a/python-pyblock-ULLLLLL.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-stupid define to get ULLONG_MAX
-and all because #include <limits.h> failed.
-
---- pyblock-0.15/dmraid.c~	2006-05-16 23:45:09.807029651 +0300
-+++ pyblock-0.15/dmraid.c	2006-05-16 23:45:12.027079592 +0300
-@@ -8,6 +8,8 @@
- #define _GNU_SOURCE
- #include <stdio.h>
- 
-+#define ULLONG_MAX	18446744073709551615ULL
-+
- #if 0
- #define Py_REF_DEBUG 1
- #endif
diff --git a/python-pyblock-fix.patch b/python-pyblock-fix.patch
deleted file mode 100644
index b6c7da9..0000000
--- a/python-pyblock-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- pyblock-0.15/dm.c.orig	2006-02-08 20:43:08.000000000 +0100
-+++ pyblock-0.15/dm.c	2006-05-20 10:09:37.897519250 +0200
-@@ -1466,7 +1466,7 @@
- static PyObject *
- pydm_maps(PyObject *self)
- {
--	struct dm_task *task;
-+	struct dm_task *task = NULL;
- 	struct dm_names *names;
- 	int n;
- 	unsigned int next = 0;
-@@ -1535,7 +1535,7 @@
- static PyObject *
- pydm_targets(PyObject *self)
- {
--	struct dm_task *task;
-+	struct dm_task *task = NULL;
- 	struct dm_versions *version, *last_version;
- 	int n;
- 	PyObject *list = NULL, *ret = NULL;
diff --git a/python-pyblock-optflags.patch b/python-pyblock-optflags.patch
deleted file mode 100644
index e78d22b..0000000
--- a/python-pyblock-optflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pyblock-0.30/Makefile~	2007-12-14 15:51:04.000000000 +0100
-+++ pyblock-0.30/Makefile	2007-12-14 15:52:52.197978950 +0100
-@@ -5,7 +5,7 @@
- DEBUGLIB := "/usr/lib/debug"
- CC := gcc
- PYVER := $(shell python -c "import sys; print sys.version[0:3]")
--CFLAGS := -g -I/usr/include/python$(PYVER) -Wall -Werror -fPIC
-+CFLAGS := $(OPTFLAGS) -I/usr/include/python$(PYVER) -Wall -Werror -fPIC
- LDFLAGS := -shared
- 
- VERSION = 0.30
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-pyblock.git/commitdiff/4f0cc362fcfafcd936513bcd8d7c5d1416638048



More information about the pld-cvs-commit mailing list