rpms/eclipse-bugzilla/devel eclipse-bugzilla.spec,1.7,1.8

[fedora-cvs-commits at redhat.com]

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

Modified Files:
	eclipse-bugzilla.spec 
Log Message:
* Wed Mar 23 2005 Andrew Overholt <overholt at redhat.com> 0.1.0_fc-8
- Update with new gcj-dbtool stuff.
- Fix Requires.
- Remove *.jarswithnativelibs.



Index: eclipse-bugzilla.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-bugzilla/devel/eclipse-bugzilla.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eclipse-bugzilla.spec	8 Mar 2005 22:06:29 -0000	1.7
+++ eclipse-bugzilla.spec	23 Mar 2005 21:31:37 -0000	1.8
@@ -26,11 +26,12 @@
 Summary: 	%{pkg_summary} 
 Name: 		%{eclipse_name}-bugzilla
 Version: 	%{version_majmin}.%{version_micro}_fc
-Release:	7
+Release:	8
 License:	Common Public License v1.0 <http://www.eclipse.org/legal/cpl-v10.html>
 Group:		Text Editors/Integrated Development Environments (IDE)
 #URL:		
-Requires: eclipse-ui
+Requires: eclipse-platform
+Requires: gcc-java
 
 # Note that following the Eclipse Releng process we do not distribute a 
 # real .tar.gz file.  Instead, you must build it by hand.  The way to do 
@@ -46,16 +47,13 @@
 BuildRequires: jpackage-utils >= 0:1.5
 BuildRequires: gtk2-devel
 BuildRequires: glib2-devel
-BuildRequires: gnome-vfs2-devel
-BuildRequires: desktop-file-utils
 BuildRequires: eclipse-platform
 BuildRequires: eclipse-jdt
 BuildRequires: eclipse-pde
 BuildRequires: libswt3-gtk2
 BuildRequires: eclipse-gtk2
-#BuildRequires: eclipse-cdt
-BuildRequires: gcc-java >= 4.0.0-0.30
-BuildRequires: java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_4rh
+BuildRequires: gcc-java >= 4.0.0-0.35
+BuildRequires: java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_13rh
 
 BuildRoot: %{_tmppath}/%{name}-buildroot
 
@@ -116,9 +114,6 @@
 
 		# Once compiled, we don't care about the jar (it's still in the original zip)
 		rm $jarname
-
-		# Create a text mapping of the jar <-->so mapping for later use.
-		echo %{eclipse_base}/plugins/$jarname::%{eclipse_lib_base}/plugins/$jarname.so >> %{name}.jarswithnativelibs
 	 done 
    ;;
   esac
@@ -150,10 +145,13 @@
 # Create plugins directory in eclipse lib base
 install -d -m755 $RPM_BUILD_ROOT/%{eclipse_lib_base}/plugins/
 
-cd $nativehome/eclipse/plugins
+# 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/bugzilla.db \
+      $j `echo $j | sed "s:$RPM_BUILD_ROOT/::" | sed "s:%{_datadir}:%{_libdir}:"`.so;
+done;
 
-# Install the text jar <--> so mapping we created when we compiled
-install -m644 %{name}.jarswithnativelibs $RPM_BUILD_ROOT/%{eclipse_lib_base}
+cd $nativehome/eclipse/plugins
 
 # Copy the .so(s) we created earlier into the build root
 for file in `find . -type f -name *.so`; do
@@ -163,22 +161,24 @@
 
 %post 
 
-# Populate db with mappings
-for j in `cat %{eclipse_lib_base}/%{name}.jarswithnativelibs`; do
-  gcj-dbtool -a %{eclipse_lib_base}/mappings/bugzilla.db `echo $j | sed "s/::/ /"`
-done
-
 # 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 %{eclipse_lib_base}/eclipse.db `find %{eclipse_lib_base}/mappings -name \*.db`
+    gcj-dbtool -m $dbLocation `find %{eclipse_lib_base}/mappings -name \*.db` $dbLocation
 fi
 
 %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 %{eclipse_lib_base}/eclipse.db `find %{eclipse_lib_base}/mappings -name \*.db`
+    gcj-dbtool -m $dbLocation `find %{eclipse_lib_base}/mappings -name \*.db` $dbLocation
 fi
 
 %clean 
@@ -192,9 +192,13 @@
 %{eclipse_lib_base}/plugins/org.eclipse.team.bugzilla*
 %{eclipse_lib_base}/plugins/org.eclipse.team.bugs*
 %{eclipse_lib_base}/mappings/bugzilla.db
-%{eclipse_lib_base}/%{name}.jarswithnativelibs
 
 %changelog
+* Wed Mar 23 2005 Andrew Overholt <overholt at redhat.com> 0.1.0_fc-8
+- Update with new gcj-dbtool stuff.
+- Fix Requires.
+- Remove *.jarswithnativelibs.
+
 * Mon Mar 07 2005 Jeff Pound <jpound at redhat.com> 0.1.0-7_fc
 - Fix query dialog UI.