[packages/xorg-cf-files] - added mandir patch (default man root to /usr/share/man, not /usr/man) - release 2

qboosh qboosh at pld-linux.org
Sat Jan 26 14:47:13 CET 2013


commit d82868b3e21d2b59b8e277059fc99d7bf93c6ad2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jan 26 14:47:58 2013 +0100

    - added mandir patch (default man root to /usr/share/man, not /usr/man)
    - release 2

 xorg-cf-files-mandir.patch | 16 ++++++++++++++++
 xorg-cf-files.spec         |  8 +++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/xorg-cf-files.spec b/xorg-cf-files.spec
index 0ba3efa..6b053f0 100644
--- a/xorg-cf-files.spec
+++ b/xorg-cf-files.spec
@@ -2,12 +2,13 @@ Summary:	X.org cf files
 Summary(pl.UTF-8):	Pliki cf z X.org
 Name:		xorg-cf-files
 Version:	1.0.4
-Release:	1
+Release:	2
 License:	MIT
 Group:		X11/Development/Tools
 Source0:	http://xorg.freedesktop.org/releases/individual/util/%{name}-%{version}.tar.bz2
 # Source0-md5:	700c6d040d36a569e657a3ba5e1d8b24
-Patch0:		%{name}-lib64.patch
+Patch0:		%{name}-mandir.patch
+Patch1:		%{name}-lib64.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -30,8 +31,9 @@ bibliotek kiedyś dostarczanych w monolitycznych wydaniach X.Org.
 
 %prep
 %setup -q -n %{name}-%{version}
-%if "%{_lib}" == "lib64"
 %patch0 -p1
+%if "%{_lib}" == "lib64"
+%patch1 -p1
 %endif
 
 %build
diff --git a/xorg-cf-files-mandir.patch b/xorg-cf-files-mandir.patch
new file mode 100644
index 0000000..34ef923
--- /dev/null
+++ b/xorg-cf-files-mandir.patch
@@ -0,0 +1,16 @@
+--- xorg-cf-files-1.0.4/linux.cf.orig	2009-10-16 23:45:42.000000000 +0200
++++ xorg-cf-files-1.0.4/linux.cf	2013-01-26 13:07:10.845411744 +0100
+@@ -94,11 +94,12 @@
+ XCOMM libc:	(LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion)
+ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
+ 
+-#if LinuxDistribution == LinuxDebian
+ # if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
+ #  define SystemManDirectory	/usr/share/man
++#  define ManDirectoryRoot	SystemManDirectory
+ # endif
+ # define HasPam			YES
++#if LinuxDistribution == LinuxDebian
+ /* un-comment this when it is un-broken */
+ /* # define JoystickSupport YES */
+ # if !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-cf-files.git/commitdiff/d82868b3e21d2b59b8e277059fc99d7bf93c6ad2



More information about the pld-cvs-commit mailing list