diff options
| author | Mark Spruiell <mes@zeroc.com> | 2015-04-22 19:17:22 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2015-04-22 19:17:22 +0000 |
| commit | 50b0bb8beec10ecb8b069053855a48abb391b5b9 (patch) | |
| tree | c901db7da4da07c8588f7fcf56deacb05206e0ed | |
| parent | ICE-6455 - remove slice2py and slice2rb C++ exe (diff) | |
| download | ice-50b0bb8beec10ecb8b069053855a48abb391b5b9.tar.bz2 ice-50b0bb8beec10ecb8b069053855a48abb391b5b9.tar.xz ice-50b0bb8beec10ecb8b069053855a48abb391b5b9.zip | |
RPM build fixes
| -rw-r--r-- | config/Make.common.rules | 4 | ||||
| -rw-r--r-- | config/Make.common.rules.mak | 4 | ||||
| -rw-r--r-- | distribution/rpm/ice.spec | 2 | ||||
| -rw-r--r-- | man/man1/iceca.1 | 14 |
4 files changed, 5 insertions, 19 deletions
diff --git a/config/Make.common.rules b/config/Make.common.rules index f96caff66bf..f4998707464 100644 --- a/config/Make.common.rules +++ b/config/Make.common.rules @@ -492,12 +492,12 @@ install-common:: $(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_docdir)) ; \ fi - @if test ! -f $(DESTDIR)$(prefix)/bin/hashpassword.py ; \ + @if test ! -f $(DESTDIR)$(prefix)/bin/icehashpassword.py ; \ then \ if test ! -d $(DESTDIR)$(prefix)/bin ; \ then \ echo "Creating $(DESTDIR)$(prefix)/bin..." ; \ $(call mkdir, $(DESTDIR)$(prefix)/bin, -p) ; \ fi ; \ - $(call installprogram,$(top_srcdir)/../scripts/hashpassword.py,$(DESTDIR)$(prefix)/bin) ; \ + $(call installprogram,$(top_srcdir)/../scripts/icehashpassword.py,$(DESTDIR)$(prefix)/bin) ; \ fi diff --git a/config/Make.common.rules.mak b/config/Make.common.rules.mak index 3c4fb396899..afd6c011f8a 100644 --- a/config/Make.common.rules.mak +++ b/config/Make.common.rules.mak @@ -209,8 +209,8 @@ install-common:: @echo "Creating $(install_bindir)..." && \ mkdir "$(prefix)\bin" - @if not exist "$(prefix)\bin\hashpassword.py" \ - @copy $(top_srcdir)\..\scripts\hashpassword.py "$(prefix)\bin"" + @if not exist "$(prefix)\bin\icehashpassword.py" \ + @copy $(top_srcdir)\..\scripts\icehashpassword.py "$(prefix)\bin"" @if not exist "$(prefix)\ICE_LICENSE$(TEXT_EXT)" \ @copy $(top_srcdir)\..\ICE_LICENSE$(TEXT_EXT) "$(prefix)" diff --git a/distribution/rpm/ice.spec b/distribution/rpm/ice.spec index 57b960add3e..9c101feecaa 100644 --- a/distribution/rpm/ice.spec +++ b/distribution/rpm/ice.spec @@ -942,7 +942,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/slice2html.1.gz %{_bindir}/icegridadmin %{_mandir}/man1/icegridadmin.1.gz -%{_bindir}/hashpassword.py +%{_bindir}/icehashpassword.py %{_defaultdocdir}/ice-utils-%{version} %post -n ice-utils -p /sbin/ldconfig diff --git a/man/man1/iceca.1 b/man/man1/iceca.1 deleted file mode 100644 index 8a62382a478..00000000000 --- a/man/man1/iceca.1 +++ /dev/null @@ -1,14 +0,0 @@ -.TH iceca 1 - -.SH NAME -iceca - Ice helper script for SSL certificate creation. - -.SH SYNOPSIS - -iceca [--verbose --keep] import sign request init - -.SH DESCRIPTION - -Full documentation for iceca is available online at: -.br -"https://doc.zeroc.com/display/Ice36/Setting+up+a+Certificate+Authority". |