[Fedora-directory-commits] adminutil Makefile, 1.1.1.1, 1.2 adminutil.spec.tmpl, 1.1.1.1, 1.2 nsdefs.mk, 1.3, 1.4 pkgadminutil.mk, 1.3, 1.4 fedora-adminutil.spec.tmpl, 1.1.1.1, NONE
Noriko Hosoi (nhosoi)
fedora-directory-commits at redhat.com
Wed Nov 16 18:50:06 UTC 2005
Author: nhosoi
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv856
Modified Files:
Makefile adminutil.spec.tmpl nsdefs.mk pkgadminutil.mk
Removed Files:
fedora-adminutil.spec.tmpl
Log Message:
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminutil/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 20 Jul 2005 22:51:30 -0000 1.1.1.1
+++ Makefile 16 Nov 2005 18:49:58 -0000 1.2
@@ -49,19 +49,14 @@
$(RELTOOLS):
cd $(ABS_ROOT_PARENT) ; cvs co RelToolsLite
-brandAdminUtil: $(RELTOOLS)
- @echo ==== Branding AdminUtil ==========
- $(PERL5) $(RELTOOLSPATH)/brandver.pl -i branding/rh/brandver.dat -s redhat-adminutil.spec
- @echo ==== Finished Branding AdminUtil ==========
-
-debrandAdminUtil: $(RELTOOLS)
- @echo ==== Deranding AdminUtil ==========
- $(PERL5) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat -s fedora-adminutil.spec
- @echo ==== Finished Deranding AdminUtil ==========
+versionAdminUtil: $(RELTOOLS)
+ @echo ==== Versioning AdminUtil ==========
+ $(PERL5) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat
+ @echo ==== Finished Versioning AdminUtil ==========
normalizeAdminUtil: $(RELTOOLS)
@echo ==== Normalizing Admin Util ==========
- $(PERL5) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/normalize.dat -s fedora-adminutil.spec
+ $(PERL5) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/normalize.dat
@echo ==== Finished Normalizing Admin Util ==========
endif
@@ -97,13 +92,11 @@
@echo ==== Finished Admin Util Package ==========
@echo
-redhat-adminutil.spec: adminutil.spec.tmpl branding/rh/brandver.dat $(RELTOOLSPATH)/brandver.pl
- sed -e s/@PLATFORM@/$(NSOS_ARCH)$(NSOS_RELEASE)/g adminutil.spec.tmpl > $@
- $(RELTOOLSPATH)/brandver.pl -i branding/rh/spec.dat $@
- mv $@ $(OBJDIR)
-
-fedora-adminutil.spec:
- sed -e s/@PLATFORM@/$(NSOS_ARCH)$(NSOS_RELEASE)/g $@.tmpl > $@
- mv $@ $(OBJDIR)
-
-
+$(ADMINUTILSPEC):
+ sed -e 's/@PLATFORM@/$(NSOS_ARCH)$(NSOS_RELEASE)/g' \
+ -e 's/@GEN-VERSION@/1.0/g' \
+ -e 's/@GEN-VERSION-NODOT@/10/g' \
+ -e 's/@PRODUCT-NAME@/Admin Util/g' \
+ -e 's/@PRODUCT-SHORT-NAME@/adminutil/g' \
+ -e 's+ at COMPANY-URL@+http://directory.fedora.redhat.com/+g' \
+ adminutil.spec.tmpl > $@
Index: adminutil.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/adminutil/adminutil.spec.tmpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- adminutil.spec.tmpl 20 Jul 2005 22:51:30 -0000 1.1.1.1
+++ adminutil.spec.tmpl 16 Nov 2005 18:49:58 -0000 1.2
@@ -6,12 +6,12 @@
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation version
# 2.1 of the License.
-#
+#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
-#
+#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -24,8 +24,8 @@
# don't bother stripping - we already do this for optimized, and we definitely
# want the symbols in the debug builds
%define __os_install_post %{nil}
-Summary: @COMPANY-PRODUCT-NAME@
-Name: @LCASE-COMPANY-NAME-NOSP at -adminutil-devel
+Summary: @PRODUCT-NAME@
+Name: @PRODUCT-SHORT-NAME@
Version: @GEN-VERSION@
Release: 1. at PLATFORM@
License: LGPL
@@ -38,29 +38,78 @@
# dependencies that we don't care about, and refuses to install
Autoreq: 0
# Without Requires: something, rpmbuild will abort!
+# Note: depending upon nspr, nss, ldapsdk, and icu
Requires: perl
-Prefix: /opt/%{name}
+Prefix: /
-%description
- at COMPANY-PRODUCT-NAME@ is a library to configure your servers using the Configuration Directory Server.
+%description
+ at PRODUCT-NAME@ is a library to configure your servers using the Configuration Directory Server.
+
+%prep
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/usr/lib/adminutil-properties
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/usr/lib/
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/usr/include/adminutil-1.0/libadminutil
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/usr/include/adminutil-1.0/libadmsslutil
-# no %prep
# no %build
%install
-mkdir -p $RPM_BUILD_ROOT/%{prefix}
-cp -r $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/include $RPM_BUILD_ROOT/%{prefix}
+cp -r $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/include $RPM_BUILD_ROOT/%{prefix}/usr
%clean
-rm -rf $RPM_BUILD_ROOT/opt
+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/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}
+%{prefix}/usr/lib/libadminutil10.so
+%{prefix}/usr/lib/libadmsslutil10.so
+%{prefix}/usr/lib/adminutil-properties/libadminutil_root.res
+
+%pre
%post
echo "Install finished."
+%postun
+rm -rf $RPM_INSTALL_PREFIX/%{prefix}/usr/lib/adminutil-properties
+
# no %preun
+%package devel
+Summary: @PRODUCT-NAME@ Development Kit
+Group: System Environment/Libraries
+
+%description devel
+ at PRODUCT-NAME@ Header files and static libraries for development
+
+%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
+%{prefix}/usr/include/adminutil-1.0/libadminutil/psetc.h
+%{prefix}/usr/include/adminutil-1.0/libadminutil/resource.h
+%{prefix}/usr/include/adminutil-1.0/libadminutil/srvutil.h
+%{prefix}/usr/include/adminutil-1.0/libadmsslutil/admsslutil.h
+%{prefix}/usr/include/adminutil-1.0/libadmsslutil/certmgt.h
+%{prefix}/usr/include/adminutil-1.0/libadmsslutil/psetcssl.h
+%{prefix}/usr/include/adminutil-1.0/libadmsslutil/SECerrs.h
+%{prefix}/usr/include/adminutil-1.0/libadmsslutil/srvutilssl.h
+%{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
+
%changelog
Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/nsdefs.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nsdefs.mk 26 Oct 2005 16:35:28 -0000 1.3
+++ nsdefs.mk 16 Nov 2005 18:49:58 -0000 1.4
@@ -240,6 +240,8 @@
DIRVERDIR=$(COMMON_OBJDIR)/include
DIRVER_H=$(DIRVERDIR)/dirver.h
+ADMINUTILSPEC=$(OBJDIR)/adminutil.spec
+
#
# -- Default Section --------------------------------------------------------
#
Index: pkgadminutil.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/pkgadminutil.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pkgadminutil.mk 26 Oct 2005 16:35:28 -0000 1.3
+++ pkgadminutil.mk 16 Nov 2005 18:49:58 -0000 1.4
@@ -47,12 +47,13 @@
endif
ABS_INSTDIR := $(shell if test \! -f $(INSTDIR); then mkdir $(INSTDIR); fi; cd $(INSTDIR); pwd)
ABS_PKGINSTDIR := $(shell if test \! -f $(PKGINSTDIR); then mkdir $(PKGINSTDIR); fi; cd $(PKGINSTDIR); pwd)
+INCL_ADMINUTIL := adminutil-1.0
+PROP_ADMINUTIL := adminutil-properties
# set the values of the macros used by rpmbuild
# name and version of RPM - must correspond to the spec file - these get branded
-RPM_BASE_NAME=fedora
RPM_VERSION=1.0
-RPM_FILE_BASE=$(RPM_BASE_NAME)-adminutil-devel-$(RPM_VERSION)
+RPM_FILE_BASE=adminutil-$(RPM_VERSION)
RPM_ARCH = $(shell uname -i)
# root dir for RPM built and temp files
ABS_TOPDIR = $(ABS_INSTDIR)
@@ -78,17 +79,17 @@
rm -rf $(PKGDIR)
-$(MKDIR) $(PKGDIR)
-$(MKDIR) $(PKGDIR)/include
- -$(MKDIR) $(PKGDIR)/include/libadminutil
- -$(MKDIR) $(PKGDIR)/include/libadmsslutil
+ -$(MKDIR) $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadminutil
+ -$(MKDIR) $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadmsslutil
-$(MKDIR) $(PKGDIR)/lib
- -$(MKDIR) $(PKGDIR)/lib/property
+ -$(MKDIR) $(PKGDIR)/lib/$(PROP_ADMINUTIL)
- cp -p $(ABS_ROOT)/include/libadminutil/*.h $(PKGDIR)/include/libadminutil
- cp -p $(ABS_ROOT)/include/libadmsslutil/*.h $(PKGDIR)/include/libadmsslutil
+ cp -p $(ABS_ROOT)/include/libadminutil/*.h $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadminutil
+ cp -p $(ABS_ROOT)/include/libadmsslutil/*.h $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadmsslutil
# Don't package sslpset.h
- rm -f $(PKGDIR)/include/libadmsslutil/sslpset.h
+ rm -f $(PKGDIR)/include/$(INCL_ADMINUTIL)/libadmsslutil/sslpset.h
cp -p $(ADMSERV_OBJDIR)/lib/*.* $(PKGDIR)/lib
- cp -p $(ADMSERV_OBJDIR)/lib/libadminutil/lib*.res $(PKGDIR)/lib/property
+ cp -p $(ADMSERV_OBJDIR)/lib/libadminutil/lib*.res $(PKGDIR)/lib/$(PROP_ADMINUTIL)
pkgSBC:
-$(RM) -rf $(ABS_PKGINSTDIR)
@@ -106,7 +107,7 @@
pkgRPM:
ifdef BUILD_RPM
# make a spec file (it's moved to OBJDIR)
- $(MAKE) -C $(ABS_ROOT) $(RPM_BASE_NAME)-adminutil.spec
- rpmbuild $(RPM_TOPDIR) $(RPM_SOURCEDIR) $(RPM_BUILDDIR) $(RPM_RPMDIR) $(RPM_SRPMDIR) --define "flavor $(RPM_FLAVOR)" --clean --nodeps -ba $(OBJDIR)/$(RPM_BASE_NAME)-adminutil.spec
+ $(MAKE) -C $(ABS_ROOT) $(ADMINUTILSPEC)
+ rpmbuild $(RPM_TOPDIR) $(RPM_SOURCEDIR) $(RPM_BUILDDIR) $(RPM_RPMDIR) $(RPM_SRPMDIR) --define "flavor $(RPM_FLAVOR)" --clean --nodeps -ba $(ADMINUTILSPEC)
cd $(ABS_INSTDIR); rm -f $(RPM_FILE_BASE).tar.gz
endif # BUILD_RPM
--- fedora-adminutil.spec.tmpl DELETED ---
More information about the 389-commits
mailing list