[qwt] cosmetics, whitespace
Rex Dieter
rdieter at fedoraproject.org
Thu Jul 14 13:42:58 UTC 2011
commit f737d4ef0715343443b44f2c261d41c5125e2267
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu Jul 14 07:41:00 2011 -0500
cosmetics, whitespace
qwt.spec | 75 +++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 43 insertions(+), 32 deletions(-)
---
diff --git a/qwt.spec b/qwt.spec
index d116611..a086acb 100644
--- a/qwt.spec
+++ b/qwt.spec
@@ -1,25 +1,18 @@
-Name: qwt
-Summary: Qt Widgets for Technical Applications
-Version: 5.2.1
-Release: 2%{?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
+Name: qwt
+Summary: Qt Widgets for Technical Applications
+Version: 5.2.1
+Release: 2%{?dist}
+
+License: LGPLv2 with exceptions
+URL: http://qwt.sourceforge.net
+Group: System Environment/Libraries
+Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Patch0: qwt-path.patch
+
+BuildRequires: qt4-devel
%description
The Qwt library contains GUI Components and utility classes which are primarily
@@ -28,8 +21,14 @@ 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.
+%package devel
+Summary: Development files for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: qt4-devel
+Group: Development/Libraries
%description devel
-Contains the development files.
+%{summary}.
+
%prep
%setup -qn %{name}-%{version}
@@ -40,6 +39,7 @@ 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
@@ -49,45 +49,50 @@ qmake-qt4
#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
+%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.2
-%{_libdir}/libqwt.so.5.2.1
+%{_libdir}/libqwt.so.5*
%files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_libdir}/libqwt.so
#%{_qt4_plugindir}/designer/libqwt_designer_plugin.so
%{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so
+
%changelog
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Fri Apr 16 2010 Frank Büttner <frank-buettner at gmx.net> - 5.2.1-1
- update to 5.2.1
+
* Fri Feb 05 2010 Frank Büttner <frank-buettner at gmx.net> - 5.2.0-1
- fix wrong lib names
+
* Fri Feb 05 2010 Frank Büttner <frank-buettner at gmx.net> - 5.2.0-0
- update to 5.2.0
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -105,14 +110,20 @@ rm -rf $RPM_BUILD_ROOT
* 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
+- 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
+- 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
+- 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
+- update to 5.0.2
+- split doc
+
* Thu May 15 2007 Frank Büttner <frank-buettner at gmx.net> - 5.0.1-1
- start
+
More information about the scm-commits
mailing list