rpms/libsx/devel libsx-shared.diff,1.1,1.2 libsx.spec,1.5,1.6
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Sat Jul 15 22:41:21 UTC 2006
Author: pertusus
Update of /cvs/extras/rpms/libsx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31610
Modified Files:
libsx-shared.diff libsx.spec
Log Message:
* Sat Jul 15 2006 Patrice Dumas <dumas at centre-cired.fr> - 2.05-9
- fix wrong link
- link against X libraries
libsx-shared.diff:
Index: libsx-shared.diff
===================================================================
RCS file: /cvs/extras/rpms/libsx/devel/libsx-shared.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libsx-shared.diff 26 Aug 2005 20:16:25 -0000 1.1
+++ libsx-shared.diff 15 Jul 2006 22:41:21 -0000 1.2
@@ -1,6 +1,24 @@
---- src/Makefile.old 2005-08-16 13:31:25.000000000 +0200
-+++ src/Makefile 2005-08-16 13:51:25.000000000 +0200
-@@ -41,7 +41,7 @@
+diff -u --recursive libsx-2.05-old/libsx_defs libsx-2.05-diff/libsx_defs
+--- libsx-2.05-old/libsx_defs 1999-12-14 13:59:35.000000000 +0100
++++ libsx-2.05-diff/libsx_defs 2006-07-16 00:17:22.000000000 +0200
+@@ -98,9 +98,11 @@
+ #
+
+ #LIBSX = ../src/libsx.a
+-LIBSX = -lsx -L/usr/X11R6/lib
++LIBSX = -lsx
++
++XLIBS = -lXpm -l$(XAWLIB) -lXmu -lXt -lX11
+
+ XPM_SUPPORT = yes
+
+-LIBS = $(LIBSX) -lXpm -l$(XAWLIB) -lXmu -lXt -lX11 -L/usr/X11R6/lib
++LIBS = $(LIBSX) $(XLIBS)
+
+diff -u --recursive libsx-2.05-old/src/Makefile libsx-2.05-diff/src/Makefile
+--- libsx-2.05-old/src/Makefile 2003-08-09 13:17:23.000000000 +0200
++++ libsx-2.05-diff/src/Makefile 2006-07-16 00:17:46.000000000 +0200
+@@ -38,10 +38,10 @@
libsx.so : $(LIBSXOBJS)
rm -f libsx.so
@@ -8,4 +26,8 @@
+ $(CC) -shared -Wl,-soname,libsx.so.0 draw.o toggle.o \
button.o string_entry.o libsx.o misc.o list.o font.o scrollbar.o \
menu.o popups.o colormap.o drawing.o dialog.o dirlist.o freq.o \
- grabpix.o colorsel.o version.o -o libsx.so
+- grabpix.o colorsel.o version.o -o libsx.so
++ grabpix.o colorsel.o version.o -o libsx.so $(XLIBS)
+
+ draw.o : draw.c libsx.h libsx_private.h
+
Index: libsx.spec
===================================================================
RCS file: /cvs/extras/rpms/libsx/devel/libsx.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libsx.spec 17 Feb 2006 16:36:06 -0000 1.5
+++ libsx.spec 15 Jul 2006 22:41:21 -0000 1.6
@@ -1,11 +1,11 @@
Name: libsx
Summary: Simple X library
Version: 2.05
-Release: 8%{?dist}
+Release: 9%{?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
+Source: ftp://ftp.ac-grenoble.fr/ge/Xlibraries/%{name}-%{version}.tar.bz2
Patch: libsx-no_nested_prototypes.diff
Patch1: libsx-comment_caddr_t.diff
Patch2: libsx-protect_strdup.diff
@@ -49,12 +49,10 @@
# use mkdir -p to create directories
%patch -p1 -P 4
# shared library with fine soname
-%patch -p0 -P 5
+%patch -p1 -P 5
%build
-sed -i -e s/'CFLAGS = -Wall -O2 -D_POSIX_SOURCE'/"CFLAGS = %{optflags} -fPIC"/g \
- -e 's:-L/usr/X11R6/lib::' libsx_defs
-make src
+make CFLAGS="%{optflags} -fPIC" src
%install
rm -rf %{buildroot}
@@ -64,15 +62,15 @@
cd src
%makeinstall LIBDIR=%{buildroot}%{_libdir} \
- INCLUDEDIR=%{buildroot}%{_includedir} \
- SHAREDIR=%{buildroot}%{_datadir}/libsx
+ INCLUDEDIR=%{buildroot}%{_includedir} \
+ SHAREDIR=%{buildroot}%{_datadir}/libsx
# fix symbolic links for shared library
cd $RPM_BUILD_ROOT/%{_libdir}
mv libsx.so libsx.so.0.0.0
chmod +x libsx.so.0.0.0
ln -s libsx.so.0.0.0 libsx.so.0
-ln -s libsx.so.0.0 libsx.so
+ln -s libsx.so.0 libsx.so
%post -p /sbin/ldconfig
@@ -95,6 +93,10 @@
%{_includedir}/libsx.h
%changelog
+* Sat Jul 15 2006 Patrice Dumas <dumas at centre-cired.fr> - 2.05-9
+- fix wrong link
+- link against X libraries
+
* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 2.05-8
- rebuild for fc5
@@ -119,5 +121,5 @@
- handle correctly shared libraries
* Fri Aug 12 2005 Patrice Dumas <dumas at centre-cired.fr> 2.05-2
-- use %{optflags} and build on fedora with gcc4
+- use %%{optflags} and build on fedora with gcc4
- reused spec from http://monkeyrpms.net/fc2-i386/html/libsx.html
More information about the fedora-extras-commits
mailing list