rpms/libsx/devel libsx-link_mkdir.diff,1.1,1.2 libsx.spec,1.9,1.10

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	libsx-link_mkdir.diff libsx.spec 
Log Message:
* Thu Dec 27 2007 Patrice Dumas <pertusus at free.fr> 2.05-13
- keep timestamps


libsx-link_mkdir.diff:

Index: libsx-link_mkdir.diff
===================================================================
RCS file: /cvs/extras/rpms/libsx/devel/libsx-link_mkdir.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libsx-link_mkdir.diff	15 Feb 2007 15:48:43 -0000	1.1
+++ libsx-link_mkdir.diff	27 Dec 2007 09:04:02 -0000	1.2
@@ -1,16 +1,19 @@
+diff -up libsx-2.05/src/Makefile.link_mkdir libsx-2.05/src/Makefile
 --- libsx-2.05/src/Makefile.link_mkdir	2003-08-09 13:17:23.000000000 +0200
-+++ libsx-2.05/src/Makefile	2007-02-15 16:39:54.000000000 +0100
-@@ -13,6 +13,9 @@
++++ libsx-2.05/src/Makefile	2007-12-27 09:39:41.000000000 +0100
+@@ -13,6 +13,11 @@ LIBDIR=/usr/X11R6/lib
  INCLUDEDIR=/usr/X11R6/include/X11/SX
  SHAREDIR=/usr/share/libsx
  
 +mkinstalldirs = mkdir -p
 +#mkinstalldirs = mkdirhier
 +
++copyfile = cp -f
++
  CC=gcc
  
  #
-@@ -38,10 +41,10 @@
+@@ -38,10 +43,10 @@ libsx.a : $(LIBSXOBJS)
  
  libsx.so : $(LIBSXOBJS)
  	rm -f libsx.so
@@ -23,24 +26,29 @@
  
  draw.o : draw.c libsx.h libsx_private.h
  
-@@ -89,11 +92,11 @@
+@@ -89,12 +94,12 @@ main.o : main.c main.h libsx.h callbacks
  callbacks.o : libsx.h callbacks.c
  
  install:
 -	mkdirhier $(LIBDIR)
-+	$(mkinstalldirs) $(LIBDIR)
- 	cp -f libsx.a libsx.so $(LIBDIR)
+-	cp -f libsx.a libsx.so $(LIBDIR)
 -	mkdirhier $(INCLUDEDIR)
-+	$(mkinstalldirs) $(INCLUDEDIR)
- 	cp -f libsx.h $(INCLUDEDIR)
+-	cp -f libsx.h $(INCLUDEDIR)
 -	mkdirhier $(SHAREDIR)
+-	cp -f dialogs/dialogs* $(SHAREDIR)
++	$(mkinstalldirs) $(LIBDIR)
++	$(copyfile) libsx.a libsx.so $(LIBDIR)
++	$(mkinstalldirs) $(INCLUDEDIR)
++	$(copyfile) -f libsx.h $(INCLUDEDIR)
 +	$(mkinstalldirs) $(SHAREDIR)
- 	cp -f dialogs/dialogs* $(SHAREDIR)
++	$(copyfile) dialogs/dialogs* $(SHAREDIR)
  
  clean:
+ 	rm -f *.o *~ dialogs/*~ core libsx.a libsx.so
+diff -up libsx-2.05/libsx_defs.link_mkdir libsx-2.05/libsx_defs
 --- libsx-2.05/libsx_defs.link_mkdir	1999-12-14 13:59:35.000000000 +0100
-+++ libsx-2.05/libsx_defs	2007-02-15 16:42:05.000000000 +0100
-@@ -44,7 +44,7 @@
++++ libsx-2.05/libsx_defs	2007-12-27 09:31:42.000000000 +0100
+@@ -44,7 +44,7 @@ CC     = gcc
  #  CFLAGS = -O3 -D_POSIX_SOURCE
  #
  # On Linux, use CC=cc, RANLIB=ranlib, and:
@@ -49,7 +57,7 @@
  #  
  # On a Motorola Delta/88K box, you can use (with gcc):
  #  CFLAGS = -O2 -DSYSV -DUSG -DMOTOROLA -DMOTOR32V2
-@@ -98,9 +98,11 @@
+@@ -98,9 +98,11 @@ endif
  #
  
  #LIBSX  = ../src/libsx.a


Index: libsx.spec
===================================================================
RCS file: /cvs/extras/rpms/libsx/devel/libsx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libsx.spec	15 Feb 2007 15:48:43 -0000	1.9
+++ libsx.spec	27 Dec 2007 09:04:02 -0000	1.10
@@ -1,9 +1,9 @@
 Name:           libsx
 Summary:        Simple X library
 Version:        2.05
-Release:        12%{?dist}
+Release:        13%{?dist}
 Group:          System Environment/Libraries
-License:        LGPL
+License:        LGPLv2+
 Url:            ftp://ftp.ac-grenoble.fr/ge/Xlibraries/
 Source:         ftp://ftp.ac-grenoble.fr/ge/Xlibraries/%{name}-%{version}.tar.bz2
 # simpler example for freq
@@ -57,7 +57,7 @@
 %patch6 -p1 -b .rgb
 
 # example of a simple use of the new GetFile
-cp %{SOURCE1} freq/simple_freq.c
+cp -p %{SOURCE1} freq/simple_freq.c
 
 %build
 make CFLAGS="%{optflags} -fPIC -DRGBTXT=\"\\\"%{_datadir}/X11/rgb.txt\\\"\""
@@ -68,22 +68,23 @@
 pushd src
 make install LIBDIR=%{buildroot}%{_libdir} \
       INCLUDEDIR=%{buildroot}%{_includedir} \
-      SHAREDIR=%{buildroot}%{_datadir}/libsx
+      SHAREDIR=%{buildroot}%{_datadir}/libsx \
+      copyfile='cp -p'
 popd
 
 # prepare examples directory
-rm -rf examples
-mkdir examples
+rm -rf __dist_examples
+mkdir -p __dist_examples/examples
 # pcurve doesn't build since it requires OPENGL_SUPPORT to be used, 
 # and we don't use it, since it is maked as experimental.
 example_dirs="bezier controlbox creq demo* draw_demo frac freq multireq skel xmore xrootbg" 
-cp -a $example_dirs libsx_defs pcurve examples/
+cp -a $example_dirs libsx_defs pcurve __dist_examples/examples/
 # remove symlinks pointing to libsx.h in example directories
-find examples/ -name libsx.h -a -type l -exec rm \{\} \;
-find examples/ -name makefile.examples -exec rm \{\} \;
-rm examples/freq/freq.c.strdup
+find __dist_examples/examples/ -name libsx.h -a -type l -exec rm \{\} \;
+find __dist_examples/examples/ -name makefile.examples -exec rm \{\} \;
+rm __dist_examples/examples/freq/freq.c.strdup
 for dir in $example_dirs; do
-  make -C examples/$dir clean
+  make -C __dist_examples/examples/$dir clean
 done
 
 
@@ -111,12 +112,15 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/ examples/
+%doc docs/ __dist_examples/examples/
 %{_libdir}/libsx.a
 %{_libdir}/libsx.so
 %{_includedir}/libsx.h
 
 %changelog
+* Thu Dec 27 2007 Patrice Dumas <pertusus at free.fr> 2.05-13
+- keep timestamps
+
 * Thu Feb 15 2007 Patrice Dumas <pertusus at free.fr> 2.05-12
 - build examples as part of building the library
 - replace libsx-protect_strdup.diff with libsx-strdup.diff, which has the fix