rpms/qwtplot3d/devel .cvsignore, 1.2, 1.3 qwtplot3d.spec, 1.1, 1.2 sources, 1.2, 1.3 license.txt, 1.1, NONE
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Mon Aug 6 09:41:45 UTC 2007
Author: chitlesh
Update of /cvs/extras/rpms/qwtplot3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15801/devel
Modified Files:
.cvsignore qwtplot3d.spec sources
Removed Files:
license.txt
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qwtplot3d/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 3 Jan 2007 08:33:46 -0000 1.2
+++ .cvsignore 6 Aug 2007 09:41:12 -0000 1.3
@@ -1 +1 @@
-qwtplot3d-0.2.6.tgz
+qwtplot3d-0.2.7.tgz
Index: qwtplot3d.spec
===================================================================
RCS file: /cvs/extras/rpms/qwtplot3d/devel/qwtplot3d.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qwtplot3d.spec 3 Jan 2007 08:33:46 -0000 1.1
+++ qwtplot3d.spec 6 Aug 2007 09:41:12 -0000 1.2
@@ -2,15 +2,15 @@
%define qtlib %(qmake -query QT_INSTALL_PREFIX)/lib
Name: qwtplot3d
-Version: 0.2.6
-Release: 2%{?dist}
+Version: 0.2.7
+Release: 1%{?dist}
Summary: Qt/OpenGL-based C++ library providing a bunch of 3D-widgets for programmers
Group: System Environment/Libraries
License: zlib/libpng License
URL: http://qwtplot3d.sourceforge.net/
-Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tgz
-Source1: http://qwtplot3d.sourceforge.net/web/navigation/license.txt
+Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tgz
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt-devel
@@ -34,33 +34,44 @@
%prep
%setup -q -n %{name}
-install -pm 644 %{SOURCE1} license.txt
#fix line endings
-%{__sed} -i 's/\r//' license.txt
+%{__sed} -i 's/\r//' COPYING
find examples -type f | xargs %{__sed} -i 's/\r//'
-#fix premissions
-chmod 644 examples/dsp.bat
+%{__sed} -i "s|-fno-exceptions|-fno-exceptions %{optflags} |" qwtplot3d.pro examples/common.pro
+%{__sed} -i "s|0.2.6|%{version}|" qwtplot3d.pro
%build
+
+
qmake qwtplot3d.pro
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{qtlib}
-%{__install} -p -m 0755 lib/libqwtplot3d.so.0.2.6 $RPM_BUILD_ROOT%{qtlib}
-ln -s libqwtplot3d.so.0.2.6 $RPM_BUILD_ROOT%{qtlib}/libqwtplot3d.so
-ln -s libqwtplot3d.so.0.2.6 $RPM_BUILD_ROOT%{qtlib}/libqwtplot3d.so.0
-mkdir -p $RPM_BUILD_ROOT%{qtinc}/qwtplot3d
-%{__install} -p -m 0644 include/* $RPM_BUILD_ROOT%{qtinc}/qwtplot3d
+%{__rm} -rf %{buildroot}
+
+%{__mkdir} -p %{buildroot}%{qtlib}
+%{__install} -p -m 0755 lib/libqwtplot3d.so.%{version} %{buildroot}%{qtlib}
+ln -s libqwtplot3d.so.%{version} %{buildroot}%{qtlib}/libqwtplot3d.so
+ln -s libqwtplot3d.so.%{version} %{buildroot}%{qtlib}/libqwtplot3d.so.0
+
+
+%{__mkdir} -p %{buildroot}%{qtinc}/qwtplot3d
+%{__install} -p -m 0644 include/* %{buildroot}%{qtinc}/qwtplot3d
+
+
+#cd examples
+#qmake
+#%{__make} %{?_smp_mflags}
+#%{__make} clean
+#%{__rm} -rf */Makefile */tmp Makefile
%clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
%post -p /sbin/ldconfig
@@ -70,17 +81,23 @@
%files
%defattr(-,root,root,-)
-%doc license.txt
+%doc COPYING
%{qtlib}/libqwtplot3d.so.*
+
%files devel
%defattr(-,root,root,-)
%doc examples
-%{qtinc}/*
+%{qtinc}/%{name}/
%{qtlib}/libqwtplot3d.so
%changelog
+* 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
+
* Tue Jan 02 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2.6-2
- Added qt-devel to -devel subpackage requires
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qwtplot3d/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 3 Jan 2007 08:33:46 -0000 1.2
+++ sources 6 Aug 2007 09:41:12 -0000 1.3
@@ -1 +1 @@
-7ef960d7874f78162d6c9d241de2843e qwtplot3d-0.2.6.tgz
+2f14660152e2e26bfeaaeec479ed9f2b qwtplot3d-0.2.7.tgz
--- license.txt DELETED ---
More information about the scm-commits
mailing list