- pldize, add missing major_version macro, no need for %doc in -doc package

Changed files:
    389-admin-console.spec -> 1.2

diff --git a/389-admin-console.spec b/389-admin-console.spec
index 3d3913a6180cf851944e5a33159176d5b190f8a7..1685f5c149c49c8b955adad9e42d81b707e31bba 100644 (file)
--- a/389-admin-console.spec
+++ b/389-admin-console.spec
@@ -1,66 +1,70 @@
-Name: 389-admin-console
-Version: 1.1.4
-Release: 1
-Summary: 389 Admin Server Management Console
+# TODO
+# - merge with fedora-ds-console.spec
 
-Group: Applications/System
-License: GPLv2
-URL: http://port389.org
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
-Source: http://port389.org/sources/%{name}-%{version}.tar.bz2
-Requires: 389-admin
-BuildRequires: ant >= 1.6.2
-BuildRequires: ldapjdk
-BuildRequires: idm-console-framework
-BuildRequires: java-devel >= 1:1.6.0
-Provides: fedora-ds-admin-console = %{version}-%{release}
-Obsoletes: fedora-ds-admin-console < 1.1.4-1
+%define                major_version 1.1
+Summary:       389 Admin Server Management Console
+Name:          389-admin-console
+Version:       1.1.4
+Release:       1
+License:       GPL v2
+Group:         Applications/System
+URL:           http://port389.org/
+Source0:       http://port389.org/sources/%{name}-%{version}.tar.bz2
+# Source0-md5: 55c661be949c27b9ff2f754abbc2607f
+BuildRequires: ant >= 1.6.2
+BuildRequires: idm-console-framework
+BuildRequires: jdk >= 1:1.6.0
+BuildRequires: jpackage-utils
+BuildRequires: ldapsdk
+BuildRequires: rpmbuild(macros) >= 1.300
+Requires:      389-admin
+Provides:      fedora-ds-admin-console = %{version}-%{release}
+Obsoletes:     fedora-ds-admin-console < 1.1.4-1
+BuildArch:     noarch
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-A Java based remote management console used for Managing 389
-Admin Server.  Requires the 389 Console to load and run the
-jar files.
+A Java based remote management console used for Managing 389 Admin
+Server. Requires the 389 Console to load and run the jar files.
 
-%package          doc
-Summary:          Web docs for 389 Admin Server Management Console
-Group:            Documentation
-Requires:         %{name} = %{version}-%{release}
+%package doc
+Summary:       Web docs for 389 Admin Server Management Console
+Group:         Documentation
+Requires:      %{name} = %{version}-%{release}
 
-%description      doc
+%description doc
 Web docs for 389 Admin Server Management Console
 
 %prep
 %setup -q
-                                                                                
+
 %build
-%{ant} \
-    -Dconsole.location=%{_javadir} \
-    -Dbuilt.dir=`pwd`/built
+%ant \
+       -Dconsole.location=%{_javadir} \
+       -Dbuilt.dir=$(pwd)/built
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/dirsrv/html/java
-install -m644 built/package/389-admin* $RPM_BUILD_ROOT%{_datadir}/dirsrv/html/java
+cp -a built/package/389-admin* $RPM_BUILD_ROOT%{_datadir}/dirsrv/html/java
+
 install -d $RPM_BUILD_ROOT%{_datadir}/dirsrv/manual/en/admin/help
-install -m644 help/en/*.html $RPM_BUILD_ROOT%{_datadir}/dirsrv/manual/en/admin
-install -m644 help/en/tokens.map $RPM_BUILD_ROOT%{_datadir}/dirsrv/manual/en/admin
-install -m644 help/en/help/*.html $RPM_BUILD_ROOT%{_datadir}/dirsrv/manual/en/admin/help
+cp -a help/en/*.html $RPM_BUILD_ROOT%{_datadir}/dirsrv/manual/en/admin
+cp -a help/en/tokens.map $RPM_BUILD_ROOT%{_datadir}/dirsrv/manual/en/admin
+cp -a help/en/help/*.html $RPM_BUILD_ROOT%{_datadir}/dirsrv/manual/en/admin/help
 
 # create symlinks
-pushd $RPM_BUILD_ROOT%{_datadir}/dirsrv/html/java
+cd $RPM_BUILD_ROOT%{_datadir}/dirsrv/html/java
 ln -s 389-admin-%{version}.jar 389-admin-%{major_version}.jar
 ln -s 389-admin-%{version}.jar 389-admin.jar
 ln -s 389-admin-%{version}_en.jar 389-admin-%{major_version}_en.jar
 ln -s 389-admin-%{version}_en.jar 389-admin_en.jar
-popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
+%defattr(644,root,root,755)
 %doc LICENSE
 %{_datadir}/dirsrv/html/java/389-admin-%{version}.jar
 %{_datadir}/dirsrv/html/java/389-admin-%{major_version}.jar
@@ -70,10 +74,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dirsrv/html/java/389-admin_en.jar
 
 %files doc
-%defattr(-,root,root,-)
+%defattr(644,root,root,755)
 %dir %{_datadir}/dirsrv/manual/en/admin
-%doc %{_datadir}/dirsrv/manual/en/admin/tokens.map
-%doc %{_datadir}/dirsrv/manual/en/admin/*.html
-%doc %{_datadir}/dirsrv/manual/en/admin/help/*.html
-
-%changelog
+%{_datadir}/dirsrv/manual/en/admin/tokens.map
+%{_datadir}/dirsrv/manual/en/admin/*.html
+%{_datadir}/dirsrv/manual/en/admin/help/*.html