rpms/eclipse-changelog/devel eclipse-changelog.spec,1.23,1.24

[fedora-cvs-commits at redhat.com]

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

Modified Files:
	eclipse-changelog.spec 
Log Message:
* Sun Apr 03 2005 Andrew Overholt <overholt at redhat.com> 2.0.1_fc-19
- Make use of rebuild-gcj-db.
- Use system-wide classmap.db.



Index: eclipse-changelog.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-changelog/devel/eclipse-changelog.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- eclipse-changelog.spec	23 Mar 2005 21:30:01 -0000	1.23
+++ eclipse-changelog.spec	4 Apr 2005 03:31:18 -0000	1.24
@@ -20,7 +20,7 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-changelog
 Version: 	%{changelog_majmin}.%{changelog_micro}_fc
-Release:        18
+Release:        19
 License:	EPL (Eclipse Public License)  <http://www.eclipse.org/legal/epl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 URL:		http://www.redhat.com
@@ -85,7 +85,6 @@
     -Dosgi.install.area=%{eclipse_base} \
     -Dorg.eclipse.core.runtime.ignoreLockFile=true \
     -Dgnu.gcj.runtime.VMClassLoader.library_control=never \
-    -Dgnu.gcj.precompiled.db.path=%{eclipse_lib_base}/eclipse.db \
      org.eclipse.core.launcher.Main \
     -application org.eclipse.ant.core.antRunner \
     -DjavacFailOnError=false \
@@ -129,11 +128,12 @@
   esac
 done
 
-# Create mappings directory in eclipse lib base 
-install -d -m755 $RPM_BUILD_ROOT/%{eclipse_lib_base}/mappings
+# Create mappings directory
+install -d -m755 $RPM_BUILD_ROOT`gcj-dbtool -p %{_libdir}`.d
 
 # Create the initial changelog database
-gcj-dbtool -n $RPM_BUILD_ROOT/%{eclipse_lib_base}/mappings/changelog.db 8000
+gcjdbdir=$RPM_BUILD_ROOT`gcj-dbtool -p %{_libdir}`.d
+gcj-dbtool -n $gcjdbdir/%{name}.db 8000
 
 
 # Create plugins directory in eclipse lib base
@@ -141,7 +141,7 @@
 
 # Populate db with mappings
 for j in `find $RPM_BUILD_ROOT/%{eclipse_base} -name \*.jar`; do
-    gcj-dbtool -f $RPM_BUILD_ROOT%{eclipse_lib_base}/mappings/changelog.db \
+    gcj-dbtool -f $gcjdbdir/%{name}.db \
       $j `echo $j | sed "s:$RPM_BUILD_ROOT/::" | sed "s:%{_datadir}:%{_libdir}:"`.so;
 done;
 
@@ -154,25 +154,10 @@
 done
 
 %post 
-# Merge all dbs together after install
-dbLocation=`gcj-dbtool -p`
-if ! [ -e $dbLocation ]; then
-    dirname $dbLocation | xargs mkdir -p
-    gcj-dbtool -n $dbLocation
-fi 
-
-if [ -n "`find %{eclipse_lib_base}/mappings -name \*.db`" ]; then
-    gcj-dbtool -m $dbLocation `find %{eclipse_lib_base}/mappings -name \*.db` $dbLocation
-fi
+rebuild-gcj-db %{_libdir}
 
 %postun
-
-# After uninstall has removed our db, again merge the dbs
-# to remove our entries
-dbLocation=`gcj-dbtool -p`
-if [ -n "`find %{eclipse_lib_base}/mappings -name \*.db`" ]; then
-    gcj-dbtool -m $dbLocation `find %{eclipse_lib_base}/mappings -name \*.db` $dbLocation
-fi
+rebuild-gcj-db %{_libdir}
 
 %clean 
 rm -rf ${RPM_BUILD_ROOT}
@@ -182,9 +167,13 @@
 %{eclipse_base}/features/com.redhat.eclipse.changelog*
 %{eclipse_base}/plugins/com.redhat.eclipse.changelog*
 %{eclipse_lib_base}/plugins/com.redhat.eclipse.changelog*
-%{eclipse_lib_base}/mappings/changelog.db
+%{_libdir}/gcj-4.0.0/classmap.db.d/%{name}.db
 
 %changelog
+* Sun Apr 03 2005 Andrew Overholt <overholt at redhat.com> 2.0.1_fc-19
+- Make use of rebuild-gcj-db.
+- Use system-wide classmap.db.
+
 * Wed Mar 23 2005 Andrew Overholt <overholt at redhat.com> 2.0.1_fc-18
 - Update with new gcj-dbtool stuff.
 - Fix Requires.