[Fedora-directory-commits] adminutil Makefile, 1.2, 1.3 adminutil.spec.tmpl, 1.2, 1.3 nsconfig.mk, 1.3, 1.4 pkgadminutil.mk, 1.4, 1.5
Noriko Hosoi (nhosoi)
fedora-directory-commits at redhat.com
Tue Dec 6 18:38:28 UTC 2005
Author: nhosoi
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818
Modified Files:
Makefile adminutil.spec.tmpl nsconfig.mk pkgadminutil.mk
Log Message:
[172166] Admin Util RPM
1) admin util library name has been updated from libadminutil10.so to
libadminutil.so.1.0 with symbolic links libadminutil.so and libadminutil.so.1
2) dropped static library
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminutil/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 16 Nov 2005 18:49:58 -0000 1.2
+++ Makefile 6 Dec 2005 18:38:20 -0000 1.3
@@ -69,6 +69,9 @@
buildnum:
if test ! -d $(NSPLATFORM_ID); then mkdir $(NSPLATFORM_ID); fi;
$(PERL5) buildnum.pl -p $(NSPLATFORM_ID)
+ @mybuildnum=`cat $(NSPLATFORM_ID)/buildnum.dat`; \
+ sed -e "s/\(ADMSDK_BUILDNUM\).*/\1 $$mybuildnum/" include/version.h > include/version.h.tmp; \
+ mv include/version.h.tmp include/version.h
$(DIRVER_H):
if test ! -d $(DIRVERDIR); then mkdir -p $(DIRVERDIR); fi;
Index: adminutil.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/adminutil/adminutil.spec.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- adminutil.spec.tmpl 16 Nov 2005 18:49:58 -0000 1.2
+++ adminutil.spec.tmpl 6 Dec 2005 18:38:20 -0000 1.3
@@ -57,22 +57,24 @@
cp -r $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/include $RPM_BUILD_ROOT/%{prefix}/usr
%clean
-rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil10.so
-rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil10.so
+rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil.so*
+rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil.so*
rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/adminutil-properties
-rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil10.a
-rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil10.a
rm -rf $RPM_BUILD_ROOT/$RPM_INSTALL_PREFIX/%{prefix}/usr/include/adminutil-1.0
%files
%defattr(-,root,root,-)
-%{prefix}/usr/lib/libadminutil10.so
-%{prefix}/usr/lib/libadmsslutil10.so
+%{prefix}/usr/lib/libadminutil.so.1.0
+%{prefix}/usr/lib/libadmsslutil.so.1.0
%{prefix}/usr/lib/adminutil-properties/libadminutil_root.res
%pre
%post
+ln -s $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil.so.1.0 $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil.so.1
+ln -s $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil.so.1.0 $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadminutil.so
+ln -s $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil.so.1.0 $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil.so.1
+ln -s $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil.so.1.0 $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/libadmsslutil.so
echo "Install finished."
%postun
@@ -89,8 +91,6 @@
%files devel
%defattr(-,root,root,-)
-%{prefix}/usr/lib/libadminutil10.a
-%{prefix}/usr/lib/libadmsslutil10.a
%{prefix}/usr/include/adminutil-1.0/libadminutil/admutil.h
%{prefix}/usr/include/adminutil-1.0/libadminutil/distadm.h
%{prefix}/usr/include/adminutil-1.0/libadminutil/prodinfo.h
@@ -105,9 +105,6 @@
%{prefix}/usr/include/adminutil-1.0/libadmsslutil/SSLerrs.h
%pre devel
-mkdir -p $RPM_INSTALL_PREFIX/%{prefix}/usr/lib
-mkdir -p $RPM_INSTALL_PREFIX/%{prefix}/usr/include/adminutil-1.0/libadminutil
-mkdir -p $RPM_INSTALL_PREFIX/%{prefix}/usr/include/adminutil-1.0/libadmsslutil
%postun devel
rm -rf $RPM_INSTALL_PREFIX/%{prefix}/usr/include/adminutil-1.0
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/nsconfig.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nsconfig.mk 26 Oct 2005 16:35:28 -0000 1.3
+++ nsconfig.mk 6 Dec 2005 18:38:20 -0000 1.4
@@ -158,13 +158,18 @@
#-------------------
ifeq ($(ARCH), HPUX)
#-------------------
-DLL_SUFFIX=sl
+HPUX_ARCH = $(shell uname -m)
+ifeq ($(HPUX_ARCH), ia64)
+ DLL_SUFFIX=so
+else
+ DLL_SUFFIX=sl
+endif
LDAP_DLL_SUFFIX=$(DLL_SUFFIX)
ifeq ($(NSOS_RELEASE), B.11.00)
- MODERNHP=1
+ MODERNHP=1
endif
ifeq ($(NSOS_RELEASE), B.11.11)
- MODERNHP=1
+ MODERNHP=1
endif
ifeq ($(MODERNHP), 1)
@@ -581,6 +586,8 @@
########################################
ADMSDK_SO_VERSION=10
+ADMSDK_SO_DOTVERSION=1.0
+ADMSDK_SO_MAJORVERSION=1
ADMSDKOBJDIR=$(OBJDIR)
ADMSDK_LIBPATH = $(ADMSDKOBJDIR)/lib
ADMSDK_INCLUDE = $(ADMSDKOBJDIR)/include
@@ -591,7 +598,7 @@
ADMSDKDLL_NAMES = $(addsuffix .dll, $ADMSDK_LIBNAMES))
ADMSDKLINK = $(addprefix $(ADMSDK_LIBPATH)/, $(ADMSDK_LIBS))
else
- ADMSDK_LIBNAMES = adminutil$(ADMSDK_SO_VERSION)
+ ADMSDK_LIBNAMES = adminutil
ADMSDK_LIBS = $(addsuffix .a, $(addprefix lib, $(ADMSDK_LIBNAMES)))
LIBADMSDK = $(addprefix $(ADMSDK_LIBPATH)/, $(ADMSDK_LIBS))
ADMSDKLINK = -L$(ADMSDK_LIBPATH) $(addprefix -l, $(ADMSDK_LIBNAMES))
Index: pkgadminutil.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/pkgadminutil.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pkgadminutil.mk 16 Nov 2005 18:49:58 -0000 1.4
+++ pkgadminutil.mk 6 Dec 2005 18:38:20 -0000 1.5
@@ -88,7 +88,7 @@
cp -p $(ABS_ROOT)/include/libadmsslutil/*.h $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadmsslutil
# Don't package sslpset.h
rm -f $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadmsslutil/sslpset.h
- cp -p $(ADMSERV_OBJDIR)/lib/*.* $(PKGDIR)/lib
+ cd $(ADMSERV_OBJDIR)/lib; tar cf - *.* | (cd $(PKGDIR)/lib; tar xf -)
cp -p $(ADMSERV_OBJDIR)/lib/libadminutil/lib*.res $(PKGDIR)/lib/$(PROP_ADMINUTIL)
pkgSBC:
More information about the Fedora-directory-commits
mailing list