rpms/qwt/FC-6 qwt-path.patch, NONE, 1.1 qwt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Frank Büttner (frankb) fedora-extras-commits at redhat.com
Sat Sep 29 19:18:26 UTC 2007


Author: frankb

Update of /cvs/extras/rpms/qwt/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1153/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	qwt-path.patch qwt.spec 
Log Message:
initial import


qwt-path.patch:

--- NEW FILE qwt-path.patch ---
diff -Nur qwt-5.0.1.org/designer/designer.pro qwt-5.0.1/designer/designer.pro
--- qwt-5.0.1.org/designer/designer.pro	2007-05-15 15:23:47.000000000 +0200
+++ qwt-5.0.1/designer/designer.pro	2007-05-15 17:29:13.000000000 +0200
@@ -92,7 +92,7 @@
         RESOURCES += \
             qwt_designer_plugin.qrc
 
-        target.path = $$[QT_INSTALL_PLUGINS]/designer
+        target.path = QTDESIGNERPATH
         INSTALLS += target
     }
 
diff -Nur qwt-5.0.1.org/qwtconfig.pri qwt-5.0.1/qwtconfig.pri
--- qwt-5.0.1.org/qwtconfig.pri	2007-05-15 12:07:33.000000000 +0200
+++ qwt-5.0.1/qwtconfig.pri	2007-05-15 15:52:39.000000000 +0200
@@ -1,18 +1,6 @@
-######################################################################
-# Install paths
-######################################################################
-
-unix {
-    INSTALLBASE    = /usr/local/qwt-5.0.2
-}
-
-win32 {
-    INSTALLBASE    = C:/Qwt-5.0.2
-}
-
-target.path    = $$INSTALLBASE/lib
-headers.path   = $$INSTALLBASE/include
-doc.path       = $$INSTALLBASE/doc
+target.path    = LIBPATH
+headers.path   = HEADERPATH
+doc.path       = DOCKPATH
 
 ######################################################################
 # qmake internal options
@@ -58,7 +46,7 @@
 # QwtSVGItem.
 ######################################################################
 
-#CONFIG     += QwtSVGItem
+CONFIG     += QwtSVGItem
 
 ######################################################################
 # If you have a commercial license you can use the MathML renderer


--- NEW FILE qwt.spec ---
Name:		qwt
Summary:	Qt Widgets for Technical Applications
Version:	5.0.2
Release:	5%{?dist}
BuildRequires:	qt4-devel
URL:		http://qwt.sourceforge.net
License:	LGPLv2 with exceptions
Group:          System Environment/Libraries
Source:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0:		qwt-path.patch
Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if 0%{?rhel} > 4
%define epel5mode 1
%else
%define epel5mode 0
%endif

%package devel
Summary:        Development and doc files for {%name}
Requires:       %{name} = %{version}-%{release} qt4-devel
Group:          Development/Libraries

%description
The Qwt library contains GUI Components and utility classes which are primarily
useful for programs with a technical background.
Besides a 2D plot widget it provides scales, sliders, dials, compasses,
thermometers, wheels and knobs to control or display values, arrays
or ranges of type double.

%description devel
Contains the development files.

%prep
%setup -qn %{name}-%{version}
%patch0 -p1
sed -i "s\LIBPATH\ $RPM_BUILD_ROOT%{_libdir}\1" qwtconfig.pri
sed -i "s\HEADERPATH\ $RPM_BUILD_ROOT%{_includedir}/%{name}\1" qwtconfig.pri
sed -i "s\DOCKPATH\ $RPM_BUILD_ROOT%{_docdir}/%{name}\1" qwtconfig.pri
#sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_qt4_plugindir}/designer\1" designer/designer.pro
sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_libdir}/qt4/plugins/designer\1" designer/designer.pro

%build
%if %{epel5mode}
%{_libdir}/qt4/bin/qmake
%else
qmake-qt4
%endif
#parallel build fails sometime so I disable it
make

%install
rm -rf $RPM_BUILD_ROOT
make install
#remove unneeded stuff
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES
%doc COPYING
%doc README
%{_libdir}/libqwt.so.5
%{_libdir}/libqwt.so.5.0
%{_libdir}/libqwt.so.5.0.2

%files devel
%defattr(-,root,root)
%{_includedir}/%{name}
%{_libdir}/libqwt.so
#%{_qt4_plugindir}/designer/libqwt_designer_plugin.so
%{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so

%changelog
* Sat Sep 29 2007 Frank Büttner <frank-buettner at gmx.net> - 5.0.2-5
 - add EPEL support
* Sat Sep 29 2007 Frank Büttner <frank-buettner at gmx.net> - 5.0.2-4
 - remove parallel build, because it will fail sometimes
* Fri Sep 28 2007 Frank Büttner <frank-buettner at gmx.net> - 5.0.2-3
 - fix some errors in the spec file
* Fri Jul 06 2007 Frank Büttner <frank-buettner at gmx.net> - 5.0.2-2
 - fix some errors in the spec file
* Mon Jun 11 2007 Frank Büttner <frank-buettner at gmx.net> - 5.0.2-1
 - update to 5.0.2
 - split doc
* Thu May 15 2007 Frank Büttner <frank-buettner at gmx.net> - 5.0.1-1
 - start


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qwt/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Sep 2007 18:42:53 -0000	1.1
+++ .cvsignore	29 Sep 2007 19:17:54 -0000	1.2
@@ -0,0 +1 @@
+qwt-5.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qwt/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Sep 2007 18:42:53 -0000	1.1
+++ sources	29 Sep 2007 19:17:54 -0000	1.2
@@ -0,0 +1 @@
+53adbb313c478dd4aae4f1c864a2037e  qwt-5.0.2.tar.bz2




More information about the fedora-extras-commits mailing list