rpms/libsx/devel libsx-mkdir_p.diff, NONE, 1.1 libsx.spec, 1.1, 1.2 libsx-mkinstalldirs.diff, 1.1, NONE mkinstalldirs, 1.1, NONE

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/libsx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17641/devel

Modified Files:
	libsx.spec 
Added Files:
	libsx-mkdir_p.diff 
Removed Files:
	libsx-mkinstalldirs.diff mkinstalldirs 
Log Message:
replace mkinstalldirs with mkdir -p


libsx-mkdir_p.diff:

--- NEW FILE libsx-mkdir_p.diff ---
Les sous-répertoires libsx-2.05-orig/src/dialogs et libsx-2.05/src/dialogs sont identiques.
diff -u libsx-2.05-orig/src/Makefile libsx-2.05/src/Makefile
--- libsx-2.05-orig/src/Makefile	2003-08-09 13:17:23.000000000 +0200
+++ libsx-2.05/src/Makefile	2005-08-27 12:31:16.000000000 +0200
@@ -13,6 +13,9 @@
 INCLUDEDIR=/usr/X11R6/include/X11/SX
 SHAREDIR=/usr/share/libsx
 
+mkinstalldirs = mkdir -p
+#mkinstalldirs = mkdirhier
+
 CC=gcc
 
 #
@@ -89,11 +92,11 @@
 callbacks.o : libsx.h callbacks.c
 
 install:
-	mkdirhier $(LIBDIR)
+	$(mkinstalldirs) $(LIBDIR)
 	cp -f libsx.a libsx.so $(LIBDIR)
-	mkdirhier $(INCLUDEDIR)
+	$(mkinstalldirs) $(INCLUDEDIR)
 	cp -f libsx.h $(INCLUDEDIR)
-	mkdirhier $(SHAREDIR)
+	$(mkinstalldirs) $(SHAREDIR)
 	cp -f dialogs/dialogs* $(SHAREDIR)
 
 clean:


Index: libsx.spec
===================================================================
RCS file: /cvs/extras/rpms/libsx/devel/libsx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libsx.spec	26 Aug 2005 20:16:25 -0000	1.1
+++ libsx.spec	27 Aug 2005 14:49:29 -0000	1.2
@@ -1,17 +1,16 @@
 Name:           libsx
 Summary:        Simple X library
 Version:        2.05
-Release:        4
+Release:        5%{?dist}
 Group:          System Environment/Libraries
 License:        LGPL
 Url:            ftp://ftp.ac-grenoble.fr/ge/Xlibraries/
 Source:	        ftp://ftp.ac-grenoble.fr/ge/Xlibraries/%{name}-%{version}.tar.bz2
-Source1:        mkinstalldirs
 Patch:          libsx-no_nested_prototypes.diff
 Patch1:         libsx-comment_caddr_t.diff
 Patch2:         libsx-protect_strdup.diff
 Patch3:         libsx-freq_simple.diff
-Patch4:         libsx-mkinstalldirs.diff
+Patch4:         libsx-mkdir_p.diff
 Patch5:         libsx-shared.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  xorg-x11-devel
@@ -45,9 +44,8 @@
 %patch -p1 -P 2
 # use the new GetFile in freq
 %patch -p1 -P 3
-# use mkinstalldirs (from automake 1.9) to create directories
+# use mkdir -p to create directories
 %patch -p1 -P 4
-cp %{SOURCE1} .
 # shared library with fine soname
 %patch -p0 -P 5
 
@@ -102,6 +100,9 @@
 %{_includedir}/libsx.h
 
 %changelog
+* Fri Aug 26 2005 Patrice Dumas <dumas at centre-cired.fr> 2.05-5
+- replace mkinstalldirs with mkdir -p
+
 * Fri Aug 26 2005 Patrice Dumas <dumas at centre-cired.fr> 2.05-4
 - correct Requires
 - remove links to the libsx.h header files in the example directories


--- libsx-mkinstalldirs.diff DELETED ---


--- mkinstalldirs DELETED ---