From 4783e419c04425176cf3ee6f9cefb4f9b33e2bce Mon Sep 17 00:00:00 2001 From: Fernando Nasser Date: Oct 22 2004 13:39:56 +0000 Subject: auto-import jakarta-commons-modeler-1.1-3jpp on branch devel from jakarta-commons-modeler-1.1-3jpp.src.rpm --- diff --git a/jakarta-commons-modeler.spec b/jakarta-commons-modeler.spec index 0dc08a4..3ac1a7b 100644 --- a/jakarta-commons-modeler.spec +++ b/jakarta-commons-modeler.spec @@ -2,7 +2,7 @@ %define short_name commons-%{base_name} %define name jakarta-%{short_name} %define version 1.1 -%define release 2jpp_4rh +%define release 3jpp %define section free Name: %{name} @@ -12,8 +12,8 @@ Epoch: 0 Summary: Jakarta Commons Modeler Package License: Apache Software License Group: Development/Libraries/Java -#Vendor: JPackage Project -#Distribution: JPackage +Vendor: JPackage Project +Distribution: JPackage Source0: %{base_name}-%{version}-src.tar.gz #Patch: %{name}.no-licence.build.patch Url: http://jakarta.apache.org/commons/%{base_name} @@ -79,16 +79,6 @@ cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} %clean rm -rf $RPM_BUILD_ROOT -%pre -rm -f %{_javadir}/%{short_name}*.jar -rm -f %{_javadir}/%{name}*.jar - -%triggerpostun -- commons-modeler < 1.2 -pushd %{_javadir} &> /dev/null - ln -sf %{name}-%{version}.jar %{short_name}-%{version}.jar - ln -sf %{short_name}-%{version}.jar %{short_name}.jar -popd &> /dev/null - %files %defattr(-,root,root) %doc STATUS.html RELEASE-NOTES.txt PROPOSAL.html @@ -99,19 +89,8 @@ popd &> /dev/null %{_javadocdir}/%{name}-%{version} %changelog -* Fri Jul 2 2004 Aizaz Ahmed 0:1.1-2jpp_4rh -- Added trigger to restore symlinks that are removed if ugrading - from a commons-modeler rhug package - -* Fri Apr 2 2004 Frank Ch. Eigler 0:1.1-2jpp_3rh -- more of the same, for version-suffixed .jar files - -* Fri Mar 26 2004 Frank Ch. Eigler 0:1.1-2jpp_2rh -- add RHUG upgrade cleanup - -* Thu Mar 4 2004 Frank Ch. Eigler 0:1.1-2jpp_1rh -- RH vacuuming - +* Sun Aug 23 2004 Randy Watler - 0:1.1-3jpp +- Rebuild with ant-1.6.2 * Thu Oct 09 2003 Henri Gomez 0:1.1-2jpp - fix junit typo (reported by Kaj J. Niemi)