[ldapjdk] Drop gcj.
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri Feb 18 07:04:02 UTC 2011
commit c51e84e264e43dab905cb8ca417b2bb76f1465bf
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Fri Feb 18 09:03:33 2011 +0200
Drop gcj.
Adapt to current guidelines.
ldapjdk.spec | 88 ++++++++++++----------------------------------------------
1 files changed, 18 insertions(+), 70 deletions(-)
---
diff --git a/ldapjdk.spec b/ldapjdk.spec
index 914b163..e9bd59e 100644
--- a/ldapjdk.spec
+++ b/ldapjdk.spec
@@ -1,15 +1,10 @@
-
-%define _with_gcj_support 1
-
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-%define spname ldapsp
-%define filtname ldapfilt
-%define beansname ldapbeans
-%define section free
+%global spname ldapsp
+%global filtname ldapfilt
+%global beansname ldapbeans
Name: ldapjdk
Version: 4.18
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 0
Summary: The Mozilla LDAP Java SDK
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -21,29 +16,14 @@ URL: http://www.mozilla.org/directory/javasdk.html
Source: %{name}-%{version}.tar.gz
Patch0: %{name}-jarnamefix.patch
-Requires: jaas
-Requires: jndi
Requires: jpackage-utils >= 0:1.5
-Requires: jsse
Requires: jss
BuildRequires: ant
-BuildRequires: jaas
-BuildRequires: jndi
BuildRequires: jpackage-utils >= 0:1.5
-BuildRequires: jsse
BuildRequires: jss
Provides: jndi-ldap = 1.3.0
-%if ! %{gcj_support}
BuildArch: noarch
-%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
%description
The Mozilla LDAP SDKs enable you to write applications which access,
@@ -78,16 +58,10 @@ sh -x ant dist
rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 mozilla/directory/java-sdk/dist/packages/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-install -m 644 mozilla/directory/java-sdk/dist/packages/%{spname}.jar $RPM_BUILD_ROOT%{_javadir}/%{spname}-%{version}.jar
-install -m 644 mozilla/directory/java-sdk/dist/packages/%{filtname}.jar $RPM_BUILD_ROOT%{_javadir}/%{filtname}-%{version}.jar
-install -m 644 mozilla/directory/java-sdk/dist/packages/%{beansname}.jar $RPM_BUILD_ROOT%{_javadir}/%{beansname}-%{version}.jar
-
-pushd $RPM_BUILD_ROOT%{_javadir}
- for jar in *-%{version}.jar ; do
- ln -fs ${jar} $(echo $jar | sed "s|-%{version}.jar|.jar|g")
- done
-popd
+install -m 644 mozilla/directory/java-sdk/dist/packages/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m 644 mozilla/directory/java-sdk/dist/packages/%{spname}.jar $RPM_BUILD_ROOT%{_javadir}/%{spname}.jar
+install -m 644 mozilla/directory/java-sdk/dist/packages/%{filtname}.jar $RPM_BUILD_ROOT%{_javadir}/%{filtname}.jar
+install -m 644 mozilla/directory/java-sdk/dist/packages/%{beansname}.jar $RPM_BUILD_ROOT%{_javadir}/%{beansname}.jar
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}-1.3.0
@@ -95,53 +69,27 @@ pushd $RPM_BUILD_ROOT%{_javadir}-1.3.0
ln -fs ../java/*%{spname}.jar jndi-ldap.jar
popd
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -r mozilla/directory/java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%postun
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -r mozilla/directory/java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
%{_javadir}/%{name}*.jar
%{_javadir}/%{spname}*.jar
%{_javadir}/%{filtname}*.jar
%{_javadir}/%{beansname}*.jar
%{_javadir}-1.3.0/*.jar
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{spname}-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{filtname}-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{beansname}-%{version}.jar.*
-%endif
-
%files javadoc
-%defattr(0644,root,root,0755)
-%dir %{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}-%{version}/*
+%defattr(-,root,root,)
+%dir %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}/*
%changelog
+* Fri Feb 18 2011 Alexander Kurtakov <akurtako at redhat.com> 0:4.18-7
+- Drop gcj.
+- Adapt to current guidelines.
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:4.18-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list