rpms/qcad/devel qcad-qass.patch, NONE, 1.1 qcad.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Sun Feb 13 20:33:37 UTC 2005
Author: mschwendt
Update of /cvs/extras/rpms/qcad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14960/devel
Modified Files:
.cvsignore sources
Added Files:
qcad-qass.patch qcad.spec
Log Message:
auto-import qcad-2.0.4.0-1 on branch devel from qcad-2.0.4.0-1.src.rpm
qcad-qass.patch:
--- NEW FILE qcad-qass.patch ---
--- 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 @@
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);
QStringList args;
args << "-profile";
- args << QDir::convertSeparators(RS_SYSTEM->getDocPath() + "/qcaddoc.adp");
+ args << QDir::convertSeparators("/usr/share/qcad/doc/qcaddoc.adp");
// args << QString("doc") + QDir::separator() + QString("qcaddoc.adp");
#if QT_VERSION>=0x030200
--- NEW FILE qcad.spec ---
Name: qcad
Version: 2.0.4.0
Release: 1
Summary: A 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
Source1: http://www.ribbonsoft.com/archives/qcad/qcad-manual-en-2.0.4.0-1.html.zip
Patch: qcad-qass.patch
URL: http://www.ribbonsoft.com/qcad.html
BuildRoot: %{_tmppath}/%{name}-%{version}-%{subversion}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt-devel >= 0:3.1.2, python-devel, desktop-file-utils, xorg-x11-devel
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
for buildings, interiors or mechanical parts. QCad works under Linux,
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
%patch -p1
%build
[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
(
cd scripts
# perl -pi -e "s|^export MAKE=.*|export MAKE=\'make CFLAGS=\"$RPM_OPT_FLAGS\" CXXFLAGS=\"$RPM_OPT_FLAGS\"\'|" build_qcad.sh
./build_qcad.sh
)
%install
rm -rf $RPM_BUILD_ROOT
%define pkgdatadir %{_datadir}/qcad
mkdir -p $RPM_BUILD_ROOT%{pkgdatadir}
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
cd qcad
cp -fr fonts $RPM_BUILD_ROOT%{pkgdatadir}
cp -fr patterns $RPM_BUILD_ROOT%{pkgdatadir}
cp -fr qm $RPM_BUILD_ROOT%{pkgdatadir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
cp -f src/xpm/qcad.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_bindir}
cp -f qcad $RPM_BUILD_ROOT%{_bindir}
cat > qcad.desktop <<EOF
[Desktop Entry]
Name=QCad
GenericName=2D CAD drawing
Comment=A simple 2D CAD program
Exec=qcad
Icon=qcad.xpm
Terminal=false
Type=Application
MimeType=image/vnd.dxf
Encoding=UTF-8
X-Desktop-File-Install-Version=0.4
StartupNotify=true
StartupWMClass=qcad
EOF
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
--add-category X-Fedora \
--add-category Application \
--add-category Graphics \
--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
%{_bindir}/*
%{_datadir}/qcad
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%changelog
* Sat Feb 12 2005 Gerard Milmeister <gemi at bluewin.ch> - 0:2.0.4.0-1
- Added documentation
- Fixed code for calling Qt Assistant: qcad-qass.patch
* Mon Nov 15 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:2.0.4.0-0.fdr.2
- Added mime type to desktop file
* Fri Oct 1 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:2.0.4.0-0.fdr.1
- New Version 2.0.4.0
* Sat Jun 5 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:2.0.3.3-0.fdr.1
- New Version 2.0.3.3
* Sun Apr 25 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:2.0.3.1-0.fdr.2
- Set QTDIR from qt.sh
* Sun Apr 11 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:2.0.3.1-0.fdr.1
- New Version 2.0.3.1
* Sat Feb 28 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:2.0.2.0-0.fdr.1
- New Version 2.0.2.0
* Fri Dec 12 2003 Gerard Milmeister <gemi at bluewin.ch> - 0:2.0.1.3-0.fdr.1
- New Version 2.0.1.3
* Wed Nov 26 2003 Gerard Milmeister <gemi at bluewin.ch> - 0:2.0.1.2-1.fdr.2
- Respect RPM_OPT_FLAGS
* Wed Nov 26 2003 Gerard Milmeister <gemi at bluewin.ch> - 0:2.0.1.2-0.fdr.1
- New Version 2.0.1.2
* Tue Oct 21 2003 Gerard Milmeister <gemi at bluewin.ch> - 0:2.0.1.1-1.fdr.1
- First Fedora release
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qcad/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 13 Feb 2005 20:21:59 -0000 1.1
+++ .cvsignore 13 Feb 2005 20:33:35 -0000 1.2
@@ -0,0 +1,2 @@
+qcad-2.0.4.0-1.src.tar.gz
+qcad-manual-en-2.0.4.0-1.html.zip
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qcad/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 13 Feb 2005 20:21:59 -0000 1.1
+++ sources 13 Feb 2005 20:33:35 -0000 1.2
@@ -0,0 +1,2 @@
+d99ae2855029af21f544e302a60d6840 qcad-2.0.4.0-1.src.tar.gz
+20d8fddbe0da978f996bdfaf9ae6bec1 qcad-manual-en-2.0.4.0-1.html.zip
More information about the fedora-extras-commits
mailing list