rpms/qcad/FC-3 qcad-64bit.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 qcad-qass.patch, 1.1, 1.2 qcad.spec, 1.5, 1.6 sources, 1.2, 1.3
Gérard Milmeister (gemi)
fedora-extras-commits at redhat.com
Wed Nov 23 20:09:02 UTC 2005
- Previous message (by thread): owners owners.list,1.411,1.412
- Next message (by thread): rpms/qcad/devel qcad-nopedantic.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 qcad-qass.patch, 1.1, 1.2 qcad.spec, 1.9, 1.10 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gemi
Update of /cvs/extras/rpms/qcad/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5506/FC-3
Modified Files:
.cvsignore qcad-qass.patch qcad.spec sources
Added Files:
qcad-64bit.patch
Log Message:
new version
qcad-64bit.patch:
--- NEW FILE qcad-64bit.patch ---
--- qcad-2.0.4.0-1.src/qcadlib/src/engine/rs_entity.cpp.64bit 2005-05-25 18:09:58.000000000 -0400
+++ qcad-2.0.4.0-1.src/qcadlib/src/engine/rs_entity.cpp 2005-05-25 18:10:29.000000000 -0400
@@ -849,7 +849,7 @@
os << " layer: NULL ";
} else {
os << " layer: " << e.layer->getName().latin1() << " ";
- os << " layer address: " << (int)(e.layer) << " ";
+ os << " layer address: " << (e.layer) << " ";
}
os << e.pen << "\n";
--- qcad-2.0.4.0-1.src/qcadlib/src/engine/rs_layer.cpp.64bit 2005-05-25 18:15:22.000000000 -0400
+++ qcad-2.0.4.0-1.src/qcadlib/src/engine/rs_layer.cpp 2005-05-25 18:16:12.000000000 -0400
@@ -57,7 +57,7 @@
os << " name: " << l.getName().latin1()
<< " pen: " << l.getPen()
<< " frozen: " << (int)l.isFrozen()
- << " address: " << (int)(&l)
+ << " address: " << (&l)
<< std::endl;
return os;
}
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qcad/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 13 Feb 2005 20:33:35 -0000 1.2
+++ .cvsignore 23 Nov 2005 20:09:00 -0000 1.3
@@ -1,2 +1,2 @@
-qcad-2.0.4.0-1.src.tar.gz
+qcad-2.0.5.0-1-community.src.tar.gz
qcad-manual-en-2.0.4.0-1.html.zip
qcad-qass.patch:
Index: qcad-qass.patch
===================================================================
RCS file: /cvs/extras/rpms/qcad/FC-3/qcad-qass.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qcad-qass.patch 13 Feb 2005 20:33:35 -0000 1.1
+++ qcad-qass.patch 23 Nov 2005 20:09:00 -0000 1.2
@@ -1,11 +1,13 @@
---- qcad-2.0.4.0-1.src/qcad/src/qc_applicationwindow.cpp.qass 2005-02-12 18:08:12.787210898 +0100
-+++ qcad-2.0.4.0-1.src/qcad/src/qc_applicationwindow.cpp 2005-02-12 18:08:50.136248827 +0100
-@@ -2765,10 +2765,10 @@
+--- qcad-2.0.5.0-1-community.src/qcad/src/qc_applicationwindow.cpp.qass 2005-11-23 12:58:38.000000000 +0100
++++ qcad-2.0.5.0-1-community.src/qcad/src/qc_applicationwindow.cpp 2005-11-23 12:59:46.000000000 +0100
+@@ -2946,12 +2946,12 @@
RS_SYSTEM->getAppDir().latin1());
RS_DEBUG->print("QC_ApplicationWindow::slotHelpManual(): appdir: %s",
RS_SYSTEM->getAppDir().latin1());
- assistant = new QAssistantClient(RS_SYSTEM->getAppDir()+"/bin", this);
+ assistant = new QAssistantClient("/usr/bin", this);
+ connect(assistant, SIGNAL(error(const QString&)),
+ this, SLOT(slotError(const QString&)));
QStringList args;
args << "-profile";
- args << QDir::convertSeparators(RS_SYSTEM->getDocPath() + "/qcaddoc.adp");
Index: qcad.spec
===================================================================
RCS file: /cvs/extras/rpms/qcad/FC-3/qcad.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qcad.spec 5 Apr 2005 13:45:19 -0000 1.5
+++ qcad.spec 23 Nov 2005 20:09:00 -0000 1.6
@@ -1,23 +1,26 @@
Name: qcad
-Version: 2.0.4.0
-Release: 3.fc3
+Version: 2.0.5.0
+Release: 1%{?dist}
Summary: Simple 2D CAD program
Group: Applications/Engineering
License: GPL
-Source: http://www.ribbonsoft.com/archives/qcad/qcad-2.0.4.0-1.src.tar.gz
+Source: http://www.ribbonsoft.com/archives/qcad/qcad-2.0.5.0-1-community.src.tar.gz
Source1: http://www.ribbonsoft.com/archives/qcad/qcad-manual-en-2.0.4.0-1.html.zip
Patch: qcad-qass.patch
Patch1: qcad-assistant.patch
Patch2: qcad-manual-bugs.patch
+Patch3: qcad-64bit.patch
+Patch4: qcad-nopedantic.patch
URL: http://www.ribbonsoft.com/qcad.html
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{subversion}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt-devel >= 3.1.2, python-devel, desktop-file-utils, xorg-x11-devel
# Help viewer is Qt Assistant in qt-devel package.
#Requires: /usr/bin/assistant
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
+
%description
QCad is an application for computer aided drafting in two
dimensions. With QCad you can create technical drawings such as plans
@@ -25,13 +28,17 @@
Unix Systems, Mac OS X and Windows. The source code of QCad is
released under the GPL (Open Source).
+
%prep
-%setup -q -n %{name}-%{version}-1.src
-%setup -q -T -D -a 1 -n %{name}-%{version}-1.src
+%setup -q -n %{name}-%{version}-1-community.src
+%setup -q -T -D -a 1 -n %{name}-%{version}-1-community.src
%patch -p1
%patch1 -p1 -b .assistanterror
# no backup file here, so it doesn't get packaged
%patch2 -p0
+%patch3 -p1 -b .64bit
+%patch4 -p1 -b .nopedantic
+
%build
[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -41,6 +48,7 @@
./build_qcad.sh
)
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -49,7 +57,7 @@
mkdir -p $RPM_BUILD_ROOT%{pkgdatadir}/library
mkdir -p $RPM_BUILD_ROOT%{pkgdatadir}/doc
-cp -fr qcad-manual-en-%{version}-1.html/* $RPM_BUILD_ROOT%{pkgdatadir}/doc
+cp -fr qcad-manual-en-2.0.4.0-1.html/* $RPM_BUILD_ROOT%{pkgdatadir}/doc
cd qcad
cp -fr fonts $RPM_BUILD_ROOT%{pkgdatadir}
@@ -86,25 +94,39 @@
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
qcad.desktop
+
%clean
rm -rf $RPM_BUILD_ROOT
+
%post
%{_bindir}/update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
%postun
%{_bindir}/update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
%files
%defattr(-,root,root,-)
-%doc README qcad/examples
+%doc qcad/README qcad/data
%{_bindir}/*
%{_datadir}/qcad
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
+
%changelog
-* Tue Apr 5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.0.4.0-3.fc3
+* Wed Nov 23 2005 Gerard Milmeister <gemi at bluewin.ch> - 2.0.5.0
+- New Version 2.0.5.0
+
+* Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 2.0.4.0-5.fc4
+- fix build on 64bit arches (#158650)
+
+* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 2.0.4.0-4.fc4
+- rebuild on all arches
+
+* Tue Apr 5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.0.4.0-3.fc4
- Add missing line in qcad-assistant.patch which prevents orphans.
* Mon Feb 14 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.0.4.0-2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qcad/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 13 Feb 2005 20:33:35 -0000 1.2
+++ sources 23 Nov 2005 20:09:00 -0000 1.3
@@ -1,2 +1,2 @@
-d99ae2855029af21f544e302a60d6840 qcad-2.0.4.0-1.src.tar.gz
+96b6a56027782aec953c9c4e64c5998c qcad-2.0.5.0-1-community.src.tar.gz
20d8fddbe0da978f996bdfaf9ae6bec1 qcad-manual-en-2.0.4.0-1.html.zip
- Previous message (by thread): owners owners.list,1.411,1.412
- Next message (by thread): rpms/qcad/devel qcad-nopedantic.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 qcad-qass.patch, 1.1, 1.2 qcad.spec, 1.9, 1.10 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list