rpms/eclipse-changelog/devel eclipse-changelog-build.properties.patch, NONE, 1.1 eclipse-changelog-customTargets.xml.patch, NONE, 1.1 eclipse-changelog.spec, 1.26, 1.27

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Jul 15 15:07:58 UTC 2005 

Author: overholt

Update of /cvs/dist/rpms/eclipse-changelog/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10559

Modified Files:
	eclipse-changelog.spec 
Added Files:
	eclipse-changelog-build.properties.patch 
	eclipse-changelog-customTargets.xml.patch 
Log Message:
* Thu Jul 14 2005 Andrew Overholt <overholt at redhat.com> 2.0.1_fc-22
- Make use of new aot-compile-rpm.
- Bump appropriate requirements.
- Add patches to fix what output format should be (.tar.gz).


eclipse-changelog-build.properties.patch:
 build.properties |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE eclipse-changelog-build.properties.patch ---
--- build.properties.orig	2005-07-15 10:52:56.000000000 -0400
+++ build.properties	2005-07-15 10:52:14.000000000 -0400
@@ -60,7 +60,10 @@
 #     configs=win32,win32,x86 & linux,motif,x86
 # By default the value is *,*,*
 configs=\
-    linux,gtk,x86  
+        *,*,*
+
+archivesFormat=\
+        *,*,*-tar
 
 #Arguments to send to the zip executable
 zipargs=

eclipse-changelog-customTargets.xml.patch:
 customTargets.xml |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE eclipse-changelog-customTargets.xml.patch ---
--- customTargets.xml.orig	2005-07-15 10:55:26.000000000 -0400
+++ customTargets.xml	2005-07-15 10:55:29.000000000 -0400
@@ -47,7 +47,7 @@
 <!-- Add one target for each root element and each configuration -->
 <!-- ===================================================================== -->
 
-<target name="assemble.com.redhat.eclipse.changelog.linux.gtk.x86">
+<target name="assemble.com.redhat.eclipse.changelog">
 	<property name="archiveName" value="eclipse-Changelog.tar.gz" />
 	<ant antfile="${assembleScriptName}"/>
 </target>


Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- eclipse-changelog.spec	27 Apr 2005 04:22:49 -0000	1.26
+++ eclipse-changelog.spec	15 Jul 2005 15:07:54 -0000	1.27
@@ -1,8 +1,7 @@
 Epoch: 1
-ExclusiveArch: i386 ppc x86_64
 
 %define gcj_support 		1
-%define pkg_summary		Eclipse Changelog plug-in
+%define pkg_summary		Eclipse ChangeLog plug-in
 %define section			free
 %define eclipse_name 		eclipse
 %define	changelog_major		2
@@ -22,7 +21,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-changelog
 Version: 	%{changelog_majmin}.%{changelog_micro}_fc
-Release:        21
+Release:        22
 License:	EPL (Eclipse Public License)  <http://www.eclipse.org/legal/epl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 URL:		http://sources.redhat.com/eclipse
@@ -38,26 +37,38 @@
 # things in the releng build.xml.
 
 Source0: eclipse-changelog.tar.gz
+Patch0:  eclipse-changelog-build.properties.patch
+Patch1:  eclipse-changelog-customTargets.xml.patch
 
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-cdt
 BuildRequires: eclipse-pydev
 %if %{gcj_support}
 BuildRequires:  gcc-java >= 4.0.0-1
-BuildRequires:  java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_18rh
-Requires(post,postun): java-1.4.2-gcj-compat >= 1.4.2.0-40jpp_18rh
+BuildRequires:    java-gcj-compat-devel >= 1.0.31
+Requires(post):   java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
 %else
 BuildRequires:	java-devel >= 1.4.2
 %endif
 
+%if %{gcj_support}
+ExclusiveArch: %{ix86} x86_64 ppc
+%else
+BuildArch:     noarch
+%endif
 BuildRoot: %{_tmppath}/%{name}-buildroot
 
 %description
-The Eclipse Changelog package contains Eclipse features and plugins that are
-useful for changelog maintenance, within the Eclipse IDE.
+The Eclipse ChangeLog package contains Eclipse features and plugins that are
+useful for ChangeLog maintenance within the Eclipse IDE.
 
 %prep
 %setup -q -c 
+pushd com.redhat.eclipse.changelog.releng
+%patch0
+%patch1
+popd
 
 %build
 
@@ -86,24 +97,6 @@
     -DbaseLocation=$SDK \
     -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.0/scripts \
     -DdontFetchAnything=true 
-
-%if %{gcj_support}
-  mkdir native
-  for file in $(pwd)/results/I.*/*.tar.gz; do
-    case $file in
-      *eclipse-Changelog*)
-  	 tar -zx -C native -f $file *.jar 
-           cd native
-           %ifarch %{ix86} ppc
-             find-and-aot-compile %{name}-native "-fPIC -fjni -O2"
-           %else
-             find-and-aot-compile %{name}-native "-fPIC -fjni -O1"
-           %endif
-           mv %{name}-native.tar.gz ..
-     ;;
-    esac
-  done	
-%endif
 popd
 
 %install
@@ -120,36 +113,8 @@
       ;;
   esac
 done
-
 %if %{gcj_support}
-
-  # Create plugins directory in eclipse lib base
-  install -d -m755 $RPM_BUILD_ROOT/%{eclipse_lib_base}/plugins
-
-  cd com.redhat.eclipse.changelog.releng/native
-  tar zxf ../%{name}-native.tar.gz
-  mv %{name}-native/eclipse/plugins/* $RPM_BUILD_ROOT/%{eclipse_lib_base}/plugins
-
-  # Directory to hold all the .jar->.so mapping dbs
-  install -d -m 755 $RPM_BUILD_ROOT`gcj-dbtool -p %{_libdir}`
-  install -d -m 755 $RPM_BUILD_ROOT`gcj-dbtool -p %{_libdir}`.d
-
-  # Create the pydev database
-  gcjdbdir=$RPM_BUILD_ROOT`gcj-dbtool -p %{_libdir}`.d
-  mkdir -p $gcjdbdir
-  gcj-dbtool -n $gcjdbdir/%{name}.db 8000
-
-  # Populate it
-  for j in `find $RPM_BUILD_ROOT/%{eclipse_base} -name \*.jar`; do
-	lib=`echo $j | sed "s:%{_datadir}:%{_libdir}:"`.so;
-	lib=`dirname $lib`/lib`basename $lib`;
-	ls -l $lib;
-	if [ -f $lib ]; then
-	  gcj-dbtool -f $gcjdbdir/%{name}.db \
-	    $j `echo $lib | sed "s:$RPM_BUILD_ROOT/::"`;
-	fi;
-  done;
-
+aot-compile-rpm
 %endif
 
 %clean 
@@ -157,10 +122,10 @@
 
 %if %{gcj_support}
 %post
-/usr/bin/rebuild-gcj-db %{_libdir}
+/usr/bin/rebuild-gcj-db
 
 %postun
-/usr/bin/rebuild-gcj-db %{_libdir}
+/usr/bin/rebuild-gcj-db
 %endif
 
 %files
@@ -168,11 +133,15 @@
 %{eclipse_base}/features/com.redhat.eclipse.changelog*
 %{eclipse_base}/plugins/com.redhat.eclipse.changelog*
 %if %{gcj_support}
-%{eclipse_lib_base}/plugins/com.redhat.eclipse.changelog*
-%{_libdir}/gcj-4.0.0/classmap.db.d/%{name}.db
+%{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Thu Jul 14 2005 Andrew Overholt <overholt at redhat.com> 2.0.1_fc-22
+- Make use of new aot-compile-rpm.
+- Bump appropriate requirements.
+- Add patches to fix what output format should be (.tar.gz).
+
 * Tue Apr 26 2005 Andrew Overholt <overholt at redhat.com> 2.0.1_fc-21
 - Re-organize and make use of scripts.

More information about the fedora-cvs-commits mailing list