View | Details | Raw Unified | Return to bug 604087
Collapse All | Expand All

(-)gnuplot.spec.original (-31 / +35 lines)
Lines 35-51 Link Here
35
Group:          Productivity/Graphics/Visualization/Graph
35
Group:          Productivity/Graphics/Visualization/Graph
36
AutoReqProv:    on
36
AutoReqProv:    on
37
Version:        4.4.0
37
Version:        4.4.0
38
Release:        1.23
38
Release:        1.34
39
Summary:        GNUplot a Function Plotting Utility
39
Summary:        GNUplot a Function Plotting Utility
40
Source0:        gnuplot-%{version}.tar.bz2
40
Source0:        gnuplot-%{version}.tar.bz2
41
Source2:        gnuplot-fr.doc.bz2
41
Source2:        gnuplot-fr.doc.bz2
42
Source3:        README.whynot
42
Source3:        README.whynot
43
Patch0:         gnuplot-4.4.0.dif
43
Patch0:         %{name}-%{version}.dif
44
Patch1:         gnuplot-4.4.0-x11ovf.dif
44
Patch1:         %{name}-%{version}-x11ovf.dif
45
Patch2:         gnuplot-4.4.0-fonts.dif
45
Patch2:         %{name}-%{version}-fonts.dif
46
Patch3:         gnuplot-4.4.0-wxt.dif
46
Patch3:         %{name}-%{version}-wxt.dif
47
Patch4:         gnuplot-4.4.0-demo.dif
47
Patch4:         %{name}-%{version}-demo.dif
48
Patch6:         gnuplot-4.2.5-fix-format-errors.dif
48
Patch5:         %{name}-%{version}-local.dif
49
Patch6:         %{name}-4.2.5-fix-format-errors.dif
49
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
50
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
50
%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
51
%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
51
%if "%_exec_prefix" == "/usr/X11R6"
52
%if "%_exec_prefix" == "/usr/X11R6"
Lines 91-104 Link Here
91
test $? -eq 0 || exit 1
92
test $? -eq 0 || exit 1
92
%patch -P 1 -p 0 -b .x11ovf
93
%patch -P 1 -p 0 -b .x11ovf
93
%patch -P 2 -p 0 -b .font
94
%patch -P 2 -p 0 -b .font
94
#%patch -P 3 -p 0
95
%patch -P 5 -p 0
95
%patch -P 4 -p 0
96
%patch -P 4 -p 0
96
%patch -P 6 -p 0
97
%patch -P 6 -p 0
97
%patch -P 0 -p 0
98
%patch -P 0 -p 0
98
99
99
%build
100
%build
100
    SECSVGA="-DSVGA_IS_SECURE=1"
101
    SECSVGA="-DSVGA_IS_SECURE=1"
101
    export  CPPFLAGS="-I%{_x11inc} -I%{_includedir}/gd -DAppDefDir=\\\"%{_appdef}\\\""
102
    export  CPPFLAGS="-I%{_x11inc} -I%{_includedir}/gd"
102
    export  CPPFLAGS="$CPPFLAGS -DGNUPLOT_LIB_DEFAULT=\\\"%{_docdir}/%{name}/demo\\\""
103
    export  CPPFLAGS="$CPPFLAGS -DGNUPLOT_LIB_DEFAULT=\\\"%{_docdir}/%{name}/demo\\\""
103
    export  CFLAGS="${RPM_OPT_FLAGS} -pipe ${SECSVGA} -D_GNU_SOURCE"
104
    export  CFLAGS="${RPM_OPT_FLAGS} -pipe ${SECSVGA} -D_GNU_SOURCE"
104
    export  CXXFLAGS="$CFLAGS -fno-strict-aliasing"
105
    export  CXXFLAGS="$CFLAGS -fno-strict-aliasing"
Lines 112-139 Link Here
112
    rm -f config.status config.log config.cache configure aclocal.m4
113
    rm -f config.status config.log config.cache configure aclocal.m4
113
    aclocal -I m4
114
    aclocal -I m4
114
    autoconf
115
    autoconf
115
    ./configure			\
116
    ./configure					\
116
	--prefix=%{_prefix}		\
117
	--prefix=%{_prefix}			\
117
	--mandir=%{_mandir}	\
118
	--mandir=%{_mandir}			\
118
	--infodir=%{_infodir}	\
119
	--infodir=%{_infodir}			\
119
	--libexecdir=%{_libdir}	\
120
	--libexecdir=%{_libdir}			\
120
	--datadir=%{_datadir}	\
121
	--datadir=%{_datadir}			\
121
	--with-gcc		\
122
	--with-gcc				\
122
	--with-x		\
123
	--with-x				\
123
	--x-includes=%{_x11inc}	\
124
	--with-x-app-defaultdir=%{_appdef} 	\
124
	--x-libraries=%{_x11lib}\
125
	--x-includes=%{_x11inc}			\
125
	--with-readline=gnu	\
126
	--x-libraries=%{_x11lib}		\
126
	--enable-history-file	\
127
	--with-readline=gnu			\
127
	--with-linux-vga	\
128
	--enable-history-file			\
128
	--with-gif=png		\
129
	--with-linux-vga			\
129
	--with-freetype=%{_libdir}\
130
	--with-gif=png				\
130
	--enable-x11-mbfonts	\
131
	--with-freetype=%{_libdir}		\
131
	--enable-h3d-quadtree	\
132
	--enable-x11-mbfonts			\
132
	--with-zlib		\
133
	--enable-h3d-quadtree			\
133
	--with-gd		\
134
	--with-zlib				\
134
	--enable-thin-splines	\
135
	--with-gd				\
135
	--without-row-help	\
136
	--enable-thin-splines			\
136
	--with-kpsexpand	\
137
	--without-row-help			\
138
	--with-kpsexpand			\
137
	--with-plot=%{_libdir}
139
	--with-plot=%{_libdir}
138
    make %{?jobs:-j%jobs}
140
    make %{?jobs:-j%jobs}
139
    pushd docs/
141
    pushd docs/
Lines 203-208 Link Here
203
%doc %{_mandir}/man1/gnuplot.1.gz
205
%doc %{_mandir}/man1/gnuplot.1.gz
204
206
205
%changelog
207
%changelog
208
* Sun May 9 2010 dieter.jurzitza@t-online.de
209
- fix AppDefDir vs. XAPPLRESDIR inconsistency, increase default number of samples.
206
* Wed Apr  7 2010 werner@suse.de
210
* Wed Apr  7 2010 werner@suse.de
207
- Update to gnuplot 4.4.0
211
- Update to gnuplot 4.4.0
208
  * NEW linetype property 'pointinterval'
212
  * NEW linetype property 'pointinterval'

Return to bug 604087