rpms/LabPlot/F-7 .cvsignore, 1.2, 1.3 LabPlot.spec, 1.2, 1.3 sources, 1.2, 1.3

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/extras/rpms/LabPlot/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25645/F-7

Modified Files:
	.cvsignore LabPlot.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/LabPlot/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Apr 2007 07:18:49 -0000	1.2
+++ .cvsignore	6 Aug 2007 10:07:35 -0000	1.3
@@ -1 +1 @@
-LabPlot-1.5.1.5.tar.bz2
+LabPlot-1.5.1.6.tar.bz2


Index: LabPlot.spec
===================================================================
RCS file: /cvs/extras/rpms/LabPlot/F-7/LabPlot.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LabPlot.spec	28 Apr 2007 16:10:08 -0000	1.2
+++ LabPlot.spec	6 Aug 2007 10:07:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:              LabPlot
-Version:           1.5.1.5
-Release:           7%{?dist}
+Version:           1.5.1.6
+Release:           1%{?dist}
 Summary:           Data Analysis and Visualization
 
 License:           GPL
@@ -106,7 +106,7 @@
 %prep
 %setup -q
 
-%{__sed} -i.system-wide -e 's|\.\./liborigin/liborigin.la||' src/Makefile.in
+%{__sed} -i.system-wide -e 's|\.\./liborigin/libLabPlotorigin.la||' src/Makefile.in
 %{__sed} -i -e '/^libLabPlot_la_LDFLAGS/s|^\(.*\) \\$|\1 -lorigin \\|' src/Makefile.in
 %{__sed} -i -e 's|-I../liborigin|-I%{_includedir}/liborigin|' src/Makefile.in
 %{__sed} -i.symbol -e '/^LIBS =/s|^\(.*\)|\1 -lm|' cephes/Makefile.in
@@ -135,6 +135,7 @@
 %configure             \
   --disable-final      \
   --disable-static     \
+  --disable-texvc      \
   --enable-gsl         \
   --enable-tiff        \
   --enable-fftw3       \
@@ -147,11 +148,11 @@
   --enable-libundo     \
 
 
-%ifarch ppc
+# clean unused-direct-shlib-dependencies
+sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
+
+
 %{__make}
-%else
-%{__make} %{?_smp_mflags}
-%endif
 
 
 %install
@@ -159,7 +160,7 @@
 %{__make} DESTDIR=%{buildroot} install
 
 
-desktop-file-install --vendor ""               \
+desktop-file-install --vendor fedora           \
     --delete-original                          \
     --remove-category Science                  \
     --dir %{buildroot}%{_datadir}/applications \
@@ -272,7 +273,7 @@
 %{_bindir}/%{name}
 %{_bindir}/labplot
 %{_bindir}/texvc
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/apps/%{name}/
 %{_datadir}/icons/??color/??x??/apps/%{name}.png
 %{_datadir}/icons/??color/??x??/mimetypes/lpl.png
@@ -332,6 +333,9 @@
 
 
 %Changelog
+* Mon Jul 30 2007  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.5.1.6-1
+- New upstream release
+
 * Mon Apr 23 2007  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 1.5.1.5-7
 - removed parallel build for ppc
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/LabPlot/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Apr 2007 07:18:49 -0000	1.2
+++ sources	6 Aug 2007 10:07:35 -0000	1.3
@@ -1 +1 @@
-c3eac8284688ebe5ad53d90c773ec7bb  LabPlot-1.5.1.5.tar.bz2
+920a6f9510de577ac31093b2783c08f0  LabPlot-1.5.1.6.tar.bz2