fkluknav pushed to gnuplot (f22). "ghost /usr/bin/gnuplot, bz#1210437"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Apr 14 14:15:23 UTC 2015


>From c9a544594e9302f2b2d730b22f873eec3267df4d Mon Sep 17 00:00:00 2001
From: Frantisek Kluknavsky <fkluknav at redhat.com>
Date: Wed, 11 Feb 2015 16:13:06 +0100
Subject: gnuplot-wx now Provides:gnuplot

- gnuplot now obsoletes old gnuplot-qt and gnuplot-wx obsoletes old gnuplot

diff --git a/gnuplot.spec b/gnuplot.spec
index 0e11505..763e884 100644
--- a/gnuplot.spec
+++ b/gnuplot.spec
@@ -7,7 +7,7 @@
 Summary: A program for plotting mathematical expressions and data
 Name: gnuplot
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 5%{?dist}
+Release: 6%{?dist}
 # MIT .. term/PostScript/aglfn.txt
 License: gnuplot and MIT
 Group: Applications/Engineering
@@ -41,6 +41,8 @@ BuildRequires: qt-devel >= 4.5
 BuildRequires: wxGTK-devel
 %endif
 
+Obsoletes: gnuplot-qt < 5.0.0-4
+
 %description
 Gnuplot is a command-line driven, interactive function plotting
 program especially suited for scientific data representation.  Gnuplot
@@ -89,6 +91,8 @@ Summary: Qt interface for gnuplot
 Requires: %{name}-common = %{version}-%{release}
 Requires(post): %{_sbindir}/alternatives
 Requires(preun): %{_sbindir}/alternatives
+Provides: gnuplot
+Obsoletes: gnuplot < 5.0.0-4
 
 %description wx
 Gnuplot is a command-line driven, interactive function plotting
@@ -329,6 +333,10 @@ fi
 %{_datadir}/texmf/tex/latex/gnuplot/
 
 %changelog
+* Wed Feb 11 2015 Frantisek Kluknavsky <fkluknav at redhat.com> - 5.0.0-6
+- gnuplot-wx now Provides:gnuplot
+- gnuplot now obsoletes old gnuplot-qt and gnuplot-wx obsoletes old gnuplot
+
 * Mon Feb 02 2015 Frantisek Kluknavsky <fkluknav at redhat.com> - 5.0.0-5
 - work around broken alternatives until better solution is found
 
-- 
cgit v0.10.2


>From 99860d8413e5e0409c33236abbf7a98ece72ad42 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Mon, 6 Apr 2015 16:14:38 -0400
Subject: rebuild for libvpx 1.4.0


diff --git a/gnuplot.spec b/gnuplot.spec
index 763e884..f51b1ed 100644
--- a/gnuplot.spec
+++ b/gnuplot.spec
@@ -7,7 +7,7 @@
 Summary: A program for plotting mathematical expressions and data
 Name: gnuplot
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 6%{?dist}
+Release: 7%{?dist}
 # MIT .. term/PostScript/aglfn.txt
 License: gnuplot and MIT
 Group: Applications/Engineering
@@ -333,6 +333,9 @@ fi
 %{_datadir}/texmf/tex/latex/gnuplot/
 
 %changelog
+* Mon Apr  6 2015 Tom Callaway <spot at fedoraproject.org> - 5.0.0-7
+- rebuild for libvpx 1.4.0
+
 * Wed Feb 11 2015 Frantisek Kluknavsky <fkluknav at redhat.com> - 5.0.0-6
 - gnuplot-wx now Provides:gnuplot
 - gnuplot now obsoletes old gnuplot-qt and gnuplot-wx obsoletes old gnuplot
-- 
cgit v0.10.2


>From b34f343cba004373253689d0d39a1172faa75ae9 Mon Sep 17 00:00:00 2001
From: Frantisek Kluknavsky <fkluknav at redhat.com>
Date: Mon, 13 Apr 2015 16:47:03 +0200
Subject: ghost /usr/bin/gnuplot, bz#1210437


diff --git a/gnuplot.spec b/gnuplot.spec
index f51b1ed..c319a81 100644
--- a/gnuplot.spec
+++ b/gnuplot.spec
@@ -7,7 +7,7 @@
 Summary: A program for plotting mathematical expressions and data
 Name: gnuplot
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 7%{?dist}
+Release: 8%{?dist}
 # MIT .. term/PostScript/aglfn.txt
 License: gnuplot and MIT
 Group: Applications/Engineering
@@ -236,6 +236,9 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/ja/man1
 mv $RPM_BUILD_ROOT%{_mandir}/man1/gnuplot-ja.1 $RPM_BUILD_ROOT/%{_mandir}/ja/man1/
 
+#ghost provide /usr/bin/gnuplot
+touch $RPM_BUILD_ROOT%{_bindir}/gnuplot 
+
 %posttrans
 %{_sbindir}/alternatives --install %{_bindir}/gnuplot gnuplot %{_bindir}/gnuplot-qt 61
 
@@ -276,6 +279,7 @@ fi
 [ -e %{_bindir}/texhash ] && %{_bindir}/texhash 2> /dev/null;
 
 %files
+%ghost %attr(0755,-,-) %{_bindir}/gnuplot
 %doc ChangeLog Copyright
 %{_bindir}/gnuplot-qt
 %{_libexecdir}/gnuplot/%{major}.%{minor}/gnuplot_qt
@@ -309,10 +313,12 @@ fi
 %{_mandir}/ja/man1/gnuplot-ja.1.gz
 
 %files minimal
+%ghost %attr(0755,-,-) %{_bindir}/gnuplot
 %doc ChangeLog Copyright
 %{_bindir}/gnuplot-minimal
 
 %files wx
+%ghost %attr(0755,-,-) %{_bindir}/gnuplot
 %doc ChangeLog Copyright
 %{_bindir}/gnuplot-wx
 
@@ -333,6 +339,9 @@ fi
 %{_datadir}/texmf/tex/latex/gnuplot/
 
 %changelog
+* Mon Apr 13 2015 Frantisek Kluknavsky <fkluknav at redhat.com> - 5.0.0-8
+- ghost /usr/bin/gnuplot, bz#1210437
+
 * Mon Apr  6 2015 Tom Callaway <spot at fedoraproject.org> - 5.0.0-7
 - rebuild for libvpx 1.4.0
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gnuplot.git/commit/?h=f22&id=e89c8840a3a4176c840f084fe0827b4d096c341b


More information about the scm-commits mailing list