- updated to 1.0.3

- removed obsolete projectroot,Makefile patches

Changed files:
    xorg-cf-files-Makefile.patch -> 1.2
    xorg-cf-files-projectroot.patch -> 1.3
    xorg-cf-files.spec -> 1.15

diff --git a/xorg-cf-files-Makefile.patch b/xorg-cf-files-Makefile.patch
deleted file mode 100644 (file)
index 82111bf..0000000
--- a/xorg-cf-files-Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xorg-cf-files-1.0.2/Makefile.am.orig       2005-12-10 17:29:39.000000000 +0100
-+++ xorg-cf-files-1.0.2/Makefile.am    2009-08-27 08:51:31.000000000 +0200
-@@ -34,7 +34,6 @@
-       oldlib.rules \
-       os2.rules \
-       os2Lib.rules \
--      os2Lib.rules \
-       osfLib.rules \
-       scoLib.rules \
-       sequentLib.rules \

diff --git a/xorg-cf-files-projectroot.patch b/xorg-cf-files-projectroot.patch
deleted file mode 100644 (file)
index cf7a759..0000000
--- a/xorg-cf-files-projectroot.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN xorg-cf-files-X11R7.0-1.0.1/X11.tmpl xorg-cf-files-X11R7.0-1.0.1.new/X11.tmpl
---- xorg-cf-files-X11R7.0-1.0.1/X11.tmpl       2005-10-01 18:45:48.000000000 +0200
-+++ xorg-cf-files-X11R7.0-1.0.1.new/X11.tmpl   2006-04-15 14:24:40.000000000 +0200
-@@ -3386,7 +3386,7 @@
- #if HasMotif
- 
- #ifndef MotifDir
--#define MotifDir /usr/X11R6
-+#define MotifDir /usr
- #endif
- #ifndef MotifDirStandard
- #define MotifDirStandard NO

diff --git a/xorg-cf-files.spec b/xorg-cf-files.spec
index 2d435459d927636af1388ec9c5a41fe7f00f5048..65e66cd742aad47fcfcf4bbeab23bbf36cc4f040 100644 (file)
--- a/xorg-cf-files.spec
+++ b/xorg-cf-files.spec
@@ -1,19 +1,17 @@
 Summary:       X.org cf files
 Summary(pl.UTF-8):     Pliki cf z X.org
 Name:          xorg-cf-files
-Version:       1.0.2
+Version:       1.0.3
 Release:       1
 License:       MIT
 Group:         X11/Development/Tools
 Source0:       http://xorg.freedesktop.org/releases/individual/util/%{name}-%{version}.tar.bz2
-# Source0-md5: 5f62dd5545b782c74f6e4e70d0e6552c
-Patch0:                %{name}-projectroot.patch
-Patch1:                %{name}-lib64.patch
-Patch2:                %{name}-Makefile.patch
+# Source0-md5: 10546b5ddda3cdda7950bb56bf98e0ea
+Patch0:                %{name}-lib64.patch
 URL:           http://xorg.freedesktop.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
-BuildRequires: xorg-util-util-macros
+BuildRequires: xorg-util-util-macros >= 1.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -24,11 +22,9 @@ Pliki cf z X.org.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
 %if "%{_lib}" == "lib64"
-%patch1 -p1
+%patch0 -p1
 %endif
-%patch2 -p1
 
 %build
 %{__aclocal}