[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 789f14ebb297b9c84e508cf455dc340ca8afb420

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 789f14ebb297b9c84e508cf455dc340ca8afb420

[git]

[-- Attachment #1: Type: text/plain, Size: 4452 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  789f14ebb297b9c84e508cf455dc340ca8afb420 (commit)
       via  7194d6cefe320e91da15567821ecb3ab36869c11 (commit)
       via  85ff162279fa6f11c2236cd5f63a73e5ed339742 (commit)
      from  276f7da92136fd121b36bb686a7e114d68182531 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 789f14ebb297b9c84e508cf455dc340ca8afb420
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Apr 17 19:20:43 2012 +0200

    xen: Remove hack that is not needed anymore since pakfire-0.9.22-2.

commit 7194d6cefe320e91da15567821ecb3ab36869c11
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Apr 17 19:19:58 2012 +0200

    man-pages: Remove some old/unused man pages.

commit 85ff162279fa6f11c2236cd5f63a73e5ed339742
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Apr 17 19:13:39 2012 +0200

    openssl: Fix installation of man pages.
    
    Some of the man pages conflict with others from
    the man-pages package. To avoid any conflicts, those
    files got an "ssl" added to their name.
    
    Fixes #10092.

-----------------------------------------------------------------------

Summary of changes:
 man-pages/man-pages.nm |   15 ++++++++++++++-
 openssl/openssl.nm     |   11 ++++-------
 xen/xen.nm             |   14 ++------------
 3 files changed, 20 insertions(+), 20 deletions(-)

Difference in files:
diff --git a/man-pages/man-pages.nm b/man-pages/man-pages.nm
index 9ce6009..c2a080f 100644
--- a/man-pages/man-pages.nm
+++ b/man-pages/man-pages.nm
@@ -5,7 +5,7 @@
 
 name       = man-pages
 version    = 3.38
-release    = 1
+release    = 2
 arch       = noarch
 
 groups     = Base Documentation
@@ -21,6 +21,19 @@ end
 source_dl  = %{url}
 
 build
+	prepare_cmds
+		# Remove deprecated/unneeded stuff:
+
+		# libattr-devel
+		rm -vf man2/{,f,l}{get,list,remove,set}xattr.2
+
+		# db4
+		rm -vf man3/{db,btree,dbopen,hash,mpool,recno}.3
+
+		# misc.
+		rm -vf man2/pciconfig_{write,read,iobase}.2
+	end
+
 	build = # Do nothing
 end
 
diff --git a/openssl/openssl.nm b/openssl/openssl.nm
index 0cbe7f9..60a5e66 100644
--- a/openssl/openssl.nm
+++ b/openssl/openssl.nm
@@ -5,7 +5,7 @@
 
 name       = openssl
 version    = 1.0.1
-release    = 1
+release    = 2
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
 groups     = System/Libraries
@@ -31,6 +31,7 @@ build
 	end
 
 	CFLAGS += -DPURIFY
+	export RPM_OPT_FLAGS = %{CFLAGS}
 
 	prepare_cmds
 		find crypto/ -name Makefile -exec \
@@ -113,7 +114,7 @@ build
 		cp -v -r certs %{BUILDROOT}/etc/pki/tls
 
 		# Rename man pages so that they don't conflict with other system man pages.
-		pushd ${BUILDROOT}/usr/share/man
+		pushd %{BUILDROOT}%{mandir}
 		for manpage in man*/*; do
 			if [ -L ${manpage} ]; then
 				TARGET=`ls -l ${manpage} | awk '{ print $NF }'`
@@ -123,9 +124,6 @@ build
 				mv ${manpage} ${manpage}ssl
 			fi
 		done
-
-		mv -v %{BUILDROOT}/usr/share/man/man1/{,ssl}passwd.1
-		mv -v %{BUILDROOT}/usr/share/man/man1/{,ssl}rand.1
 		popd
 	end
 end
@@ -138,8 +136,7 @@ packages
 
 		requires += ca-certificates
 
-		provides += libcrypto.so.10(libcrypto.so.10)
-		provides += libssl.so.10(libssl.so.10)
+		files += %{libdir}/openssl
 	end
 
 	package %{name}-devel
diff --git a/xen/xen.nm b/xen/xen.nm
index b736307..3647cd7 100644
--- a/xen/xen.nm
+++ b/xen/xen.nm
@@ -5,7 +5,7 @@
 
 name       = xen
 version    = 4.1.2
-release    = 5
+release    = 6
 sup_arches = i686 x86_64
 
 maintainer = Ben Schweikert <ben.schweikert(a)ipfire.org>
@@ -28,7 +28,7 @@ build
 	requires
 		chrpath
 		dev86
-		gettext-devel
+		gettext
 		iasl
 		libuuid-devel
 		ncurses-devel
@@ -115,16 +115,6 @@ packages
 			run applications which manage Xen virtual machines
 		end
 
-		# Very hacky workaround for an improper name of libfsimage.
-		if "%{DISTRO_ARCH}" == "x86_64"
-			provides
-				libfsimage.so.1.0(libfsimage.so.1.0)(64bit)
-			end
-		else
-			provides
-				libfsimage.so.1.0(libfsimage.so.1.0)
-			end
-		end
 		files += %{libdir}/fs
 	end
 


hooks/post-receive
--
IPFire 3.x development tree