packages: parted/parted-BIG_FAT_WARNING.patch, parted/parted.spec, parted/p...

qboosh qboosh at pld-linux.org
Tue Mar 6 20:01:33 CET 2012 

Author: qboosh                       Date: Tue Mar  6 19:01:33 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.1 (note: new soname)
- updated BIG_FAT_WARNING patch
- added link patch to fix libparted-fs-resize linking

---- Files affected:
packages/parted:
   parted-BIG_FAT_WARNING.patch (1.5 -> 1.6) , parted.spec (1.160 -> 1.161) , parted-link.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/parted/parted-BIG_FAT_WARNING.patch
diff -u packages/parted/parted-BIG_FAT_WARNING.patch:1.5 packages/parted/parted-BIG_FAT_WARNING.patch:1.6
--- packages/parted/parted-BIG_FAT_WARNING.patch:1.5	Fri Aug 28 20:51:35 2009
+++ packages/parted/parted-BIG_FAT_WARNING.patch	Tue Mar  6 20:01:27 2012
@@ -1,6 +1,6 @@
---- parted-1.8.6/parted/ui.c.orig	2007-04-04 10:38:45.596415889 +0200
-+++ parted-1.8.6/parted/ui.c	2007-04-04 10:39:49.904080574 +0200
-@@ -160,6 +160,11 @@
+--- parted-3.1/parted/ui.c.orig	2012-03-04 21:39:46.283904709 +0100
++++ parted-3.1/parted/ui.c	2012-03-06 15:55:54.862325698 +0100
+@@ -161,6 +161,11 @@
  static const char* banner_msg = N_(
  "Welcome to GNU Parted! Type 'help' to view a list of commands.\n");
  
@@ -12,13 +12,13 @@
  static const char* usage_msg = N_(
  "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n"
  "Apply COMMANDs with PARAMETERS to DEVICE.  If no COMMAND(s) are given, "
-@@ -1463,7 +1468,7 @@
+@@ -1577,7 +1582,7 @@
  
          print_using_dev (*dev);
  
 -        list = str_list_create (_(banner_msg), NULL);
 +        list = str_list_create (_(banner_msg), _(warning_msg), NULL);
-         str_list_print_wrap (list, screen_width (), 0, 0);
+         str_list_print_wrap (list, screen_width (), 0, 0, stdout);
          str_list_destroy (list);
  
 --- parted-1.7.1/po/pl.po.orig	2006-05-27 21:38:39.582850750 +0200

================================================================
Index: packages/parted/parted.spec
diff -u packages/parted/parted.spec:1.160 packages/parted/parted.spec:1.161
--- packages/parted/parted.spec:1.160	Tue Jan  3 20:50:06 2012
+++ packages/parted/parted.spec	Tue Mar  6 20:01:28 2012
@@ -4,6 +4,7 @@
 %bcond_with	static		# link statically
 %bcond_without	nls		# build without NLS
 %bcond_without	readline	# build without readline support
+%bcond_with	selinux		# SELinux support
 %bcond_with	uClibc		# add somewhat nasty uClibc patch, that
 #				# shouldn't cause problems, but who knows...
 #
@@ -14,12 +15,12 @@
 Summary(ru.UTF-8):	Программа GNU манипуляции дисковыми разделами
 Summary(uk.UTF-8):	Програма GNU маніпуляції дисковими розділами
 Name:		parted
-Version:	3.0
-Release:	3
+Version:	3.1
+Release:	1
 License:	GPL v3+
 Group:		Applications/System
 Source0:	http://ftp.gnu.org/gnu/parted/%{name}-%{version}.tar.xz
-# Source0-md5:	c415e5c97f86b5ff65a2d925e5a3feb7
+# Source0-md5:	5d89d64d94bcfefa9ce8f59f4b81bdcb
 # restored from git repository
 Source1:	%{name}.m4
 Patch1:		%{name}-no_wrap.patch
@@ -27,6 +28,7 @@
 Patch3:		%{name}-uClibc.patch
 Patch4:		%{name}-info.patch
 Patch5:		%{name}-man-pt.patch
+Patch6:		%{name}-link.patch
 Patch7:		static.patch
 URL:		http://www.gnu.org/software/parted/
 BuildRequires:	autoconf >= 2.63
@@ -35,6 +37,10 @@
 BuildRequires:	device-mapper-devel >= 1.02.02
 BuildRequires:	gettext-devel >= 0.18
 BuildRequires:	libblkid-devel >= 2.17
+%if %{with selinux}
+BuildRequires:	libselinux-devel
+BuildRequires:	libsepol-devel
+%endif
 BuildRequires:	libtool
 BuildRequires:	libuuid-devel
 %{?with_static:BuildRequires:	libuuid-static}
@@ -148,6 +154,7 @@
 %{?with_uClibc:%patch3 -p1}
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 %patch7 -p1
 
 %{__rm} po/stamp-po
@@ -160,11 +167,11 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	%{!?with_readline:--without-readline} \
-	%{?with_readline:--with-readline} \
 	%{!?with_nls:--disable-nls} \
+	--disable-silent-rules \
+	%{?with_selinux:--enable-selinux} \
 	%{?with_static:--without-pic} \
-	--disable-silent-rules
+	--with-readline%{!?with_readline:=no}
 
 %{!?with_nls:touch include/libintl.h}
 
@@ -216,13 +223,18 @@
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libparted.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libparted.so.1
+%attr(755,root,root) %ghost %{_libdir}/libparted.so.2
+%attr(755,root,root) %{_libdir}/libparted-fs-resize.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libparted-fs-resize.so.0
 %endif
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc/{API,FAT}
-%{!?with_static:%attr(755,root,root) %{_libdir}/libparted.so}
+%if %{without static}
+%attr(755,root,root) %{_libdir}/libparted.so
+%attr(755,root,root) %{_libdir}/libparted-fs-resize.so
+%endif
 %{_includedir}/parted
 %{_pkgconfigdir}/libparted.pc
 %{_aclocaldir}/parted.m4
@@ -230,6 +242,7 @@
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libparted.a
+%{_libdir}/libparted-fs-resize.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -237,6 +250,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.161  2012/03/06 19:01:28  qboosh
+- updated to 3.1 (note: new soname)
+- updated BIG_FAT_WARNING patch
+- added link patch to fix libparted-fs-resize linking
+
 Revision 1.160  2012/01/03 19:50:06  lisu
 - rel 3
 

================================================================
Index: packages/parted/parted-link.patch
diff -u /dev/null packages/parted/parted-link.patch:1.4
--- /dev/null	Tue Mar  6 20:01:33 2012
+++ packages/parted/parted-link.patch	Tue Mar  6 20:01:28 2012
@@ -0,0 +1,31 @@
+--- parted-3.1/libparted/fs/Makefile.am.orig	2012-02-26 16:03:17.000000000 +0100
++++ parted-3.1/libparted/fs/Makefile.am	2012-03-06 18:52:58.519355591 +0100
+@@ -66,6 +66,7 @@
+ AGE = 0
+ 
+ sym_file = $(srcdir)/fsresize.sym
++libparted_fs_resize_la_LIBADD = $(top_builddir)/libparted/libparted.la $(UUID_LIBS)
+ libparted_fs_resize_la_LDFLAGS =		\
+   -Wl,--version-script=$(sym_file)		\
+   -version-info $(CURRENT):$(REVISION):$(AGE)
+--- parted-3.1/libparted/Makefile.am.orig	2012-03-02 17:05:13.000000000 +0100
++++ parted-3.1/libparted/Makefile.am	2012-03-06 19:00:48.832704671 +0100
+@@ -12,7 +12,7 @@
+ 
+ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+ 
+-SUBDIRS       = labels fs . $(SUBDIRS_CHECK)
++SUBDIRS       = labels . fs $(SUBDIRS_CHECK)
+ 
+ 
+ partedincludedir = \
+@@ -60,6 +60,9 @@
+   $(LIB_BLKID)		\
+   $(INTLLIBS)
+ 
++fs/libfs.la:
++	$(MAKE) -C $(top_builddir)/libparted/fs libfs.la
++
+ EXTRA_DIST	      = mbr.s
+ 
+ INCLUDES = $(partedincludedir) $(INTLINCS)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/parted/parted-BIG_FAT_WARNING.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/parted/parted.spec?r1=1.160&r2=1.161&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/parted/parted-link.patch?r1=1.3&r2=1.4&f=u

More information about the pld-cvs-commit mailing list