rpms/qwtplot3d/devel qwtplot3d.spec,1.2,1.3

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/extras/rpms/qwtplot3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24111/devel

Modified Files:
	qwtplot3d.spec 
Log Message:



Index: qwtplot3d.spec
===================================================================
RCS file: /cvs/extras/rpms/qwtplot3d/devel/qwtplot3d.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qwtplot3d.spec	6 Aug 2007 09:41:12 -0000	1.2
+++ qwtplot3d.spec	26 Aug 2007 23:16:18 -0000	1.3
@@ -3,11 +3,12 @@
 
 Name:           qwtplot3d
 Version:        0.2.7
-Release:        1%{?dist}
-Summary:        Qt/OpenGL-based C++ library providing a bunch of 3D-widgets for programmers
+Release:        4%{?dist}
+Summary:        Qt/OpenGL-based C++ library providing a bunch of 3D-widgets
 
 Group:          System Environment/Libraries
-License:        zlib/libpng License
+#zlib/libpng License
+License:        zlib
 URL:            http://qwtplot3d.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tgz
 
@@ -17,9 +18,10 @@
 BuildRequires:  libXmu-devel
 
 %description
-QwtPlot3D is not a  program, but a feature-rich Qt/OpenGL-based C++
-programming library, providing essentially a  bunch of 3D-widgets for
-programmers
+QwtPlot3D is not a program, but a feature-rich Qt/OpenGL-based C++
+programming library, providing essentially a bunch of 3D-widgets for
+programmers.
+
 
 %package        devel
 Summary:        Development files for %{name}
@@ -32,6 +34,29 @@
 developing applications that use %{name}.
 
 
+
+%package        qt4
+Summary:        Qt4/OpenGL-based C++ library providing a bunch of 3D-widgets
+Group:          System Environment/Libraries
+BuildRequires:  qt4-devel
+
+%description    qt4
+QwtPlot3D is not a program, but a feature-rich Qt4/OpenGL-based C++
+programming library, providing essentially a bunch of 3D-widgets for
+programmers.
+
+%package        qt4-devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name}-qt4 = %{version}-%{release}
+Requires:       qt4-devel
+
+%description    qt4-devel
+The %{name}-devel package contains qt4 libraries and header files for
+developing applications that use %{name}.
+
+
+
 %prep
 %setup -q -n %{name}
 
@@ -42,9 +67,26 @@
 %{__sed}  -i "s|-fno-exceptions|-fno-exceptions %{optflags} |" qwtplot3d.pro examples/common.pro
 %{__sed}  -i "s|0.2.6|%{version}|" qwtplot3d.pro
 
+# treating soname
+%{__sed}  -i "s|TARGET *= qwtplot3d|TARGET = qwtplot3d-qt4|" qwtplot3d.pro
+
+
+%{__mkdir} qt4
 
 %build
 
+#QT4
+
+cd qt4
+qmake-qt4 ../qwtplot3d.pro
+%{__make} %{?_smp_mflags}
+
+%{__make} clean
+cd ..
+# treating soname
+%{__sed}  -i "s|TARGET *= qwtplot3d-qt4|TARGET = qwtplot3d|" qwtplot3d.pro
+
+#QT3
 
 qmake qwtplot3d.pro
 %{__make} %{?_smp_mflags}
@@ -53,9 +95,11 @@
 %install
 %{__rm} -rf %{buildroot}
 
+#QT3
 %{__mkdir} -p %{buildroot}%{qtlib}
 %{__install} -p -m 0755 lib/libqwtplot3d.so.%{version} %{buildroot}%{qtlib}
 ln -s libqwtplot3d.so.%{version} %{buildroot}%{qtlib}/libqwtplot3d.so
+#rm -f %{buildroot}%{qtlib}/libqwtplot3d.so.0
 ln -s libqwtplot3d.so.%{version} %{buildroot}%{qtlib}/libqwtplot3d.so.0
 
 
@@ -63,11 +107,17 @@
 %{__install} -p -m 0644 include/* %{buildroot}%{qtinc}/qwtplot3d
 
 
-#cd examples
-#qmake
-#%{__make} %{?_smp_mflags}
-#%{__make} clean
-#%{__rm} -rf */Makefile */tmp Makefile
+# QT4
+
+%{__mkdir} -p %{buildroot}%{_qt4_headerdir}/qwtplot3d
+%{__install} -p -m 0644 include/* %{buildroot}%{_qt4_headerdir}/qwtplot3d
+
+cd qt4
+%{__mkdir} -p %{buildroot}%{_qt4_libdir}
+%{__install} -p -m 0755 lib/libqwtplot3d-qt4.so.%{version} %{buildroot}%{_qt4_libdir}
+ln -s libqwtplot3d-qt4.so.%{version} %{buildroot}%{_qt4_libdir}/libqwtplot3d-qt4.so
+#rm -f %{buildroot}%{_qt4_libdir}/libqwtplot3d-qt4.so.0
+ln -s libqwtplot3d-qt4.so.%{version} %{buildroot}%{_qt4_libdir}/libqwtplot3d-qt4.so.0
 
 
 %clean
@@ -79,11 +129,26 @@
 %postun -p /sbin/ldconfig
 
 
+%post qt4 -p /sbin/ldconfig
+
+%postun qt4 -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING
 %{qtlib}/libqwtplot3d.so.*
 
+%files qt4
+%doc COPYING
+%defattr(-,root,root,-)
+%{_qt4_libdir}/libqwtplot3d-qt4.so.*
+
+%files qt4-devel
+%defattr(-,root,root,-)
+%doc examples
+%{_qt4_headerdir}/%{name}/
+%{_qt4_libdir}/libqwtplot3d-qt4.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -93,7 +158,17 @@
 
 
 %changelog
-* Mon Jul 30 2007  Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.2.7-1
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.2.7-4
+- fixed -qt4 symbolic links
+- update license to zlib
+
+* Thu Aug 23 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.2.7-3
+- queued for mass rebuild for Fedora 8 - BuildID
+
+* Wed Aug 08 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.2.7-2
+- built and shipped qwtplot3d-qt4 and devel
+
+* Mon Jul 30 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.2.7-1
 - New upstream release
 - Added optflags to the make process
 - fix ownership