[krazy2/f12/master: 9/11] - Update snapshot - FTBFS krazy2-2.9-4.20090928svn.fc13 (#599851) - squash /lib rpaths
Kevin Kofler
kkofler at fedoraproject.org
Fri Oct 1 04:12:50 UTC 2010
commit dca4e49db16d6913d9d6fa8af700fb83e9924a5d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Mon Jun 28 16:57:00 2010 +0000
- Update snapshot
- FTBFS krazy2-2.9-4.20090928svn.fc13 (#599851)
- squash /lib rpaths
.gitignore | 2 +-
krazy2-2.9-qt47.patch | 11 +++++++++++
krazy2-2.9-rpath.patch | 11 +++++++++++
krazy2.spec | 29 ++++++++++++++++++++++-------
sources | 2 +-
5 files changed, 46 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7818485..0604533 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-krazy2-2.9.tar.bz2
+krazy2-2.9-20100628.tar.bz2
diff --git a/krazy2-2.9-qt47.patch b/krazy2-2.9-qt47.patch
new file mode 100644
index 0000000..bf60d76
--- /dev/null
+++ b/krazy2-2.9-qt47.patch
@@ -0,0 +1,11 @@
+diff -up krazy2-2.9/cppchecks/cplusplus/cppmodel/typeprettyprinter.cpp.qt47 krazy2-2.9/cppchecks/cplusplus/cppmodel/typeprettyprinter.cpp
+--- krazy2-2.9/cppchecks/cplusplus/cppmodel/typeprettyprinter.cpp.qt47 2009-03-16 10:14:08.000000000 -0500
++++ krazy2-2.9/cppchecks/cplusplus/cppmodel/typeprettyprinter.cpp 2010-06-28 11:11:53.318454542 -0500
+@@ -30,7 +30,6 @@ using namespace CppModel;
+
+ TypePrettyPrinter::TypePrettyPrinter(Overview const *overview)
+ : m_overview(overview),
+- m_name(0),
+ m_markArgument(0),
+ m_showArgumentNames(false),
+ m_showReturnTypes(false),
diff --git a/krazy2-2.9-rpath.patch b/krazy2-2.9-rpath.patch
new file mode 100644
index 0000000..936670c
--- /dev/null
+++ b/krazy2-2.9-rpath.patch
@@ -0,0 +1,11 @@
+diff -up krazy2-2.9/cppchecks/CMakeLists.txt.rpath krazy2-2.9/cppchecks/CMakeLists.txt
+--- krazy2-2.9/cppchecks/CMakeLists.txt.rpath 2009-03-12 22:37:26.000000000 -0500
++++ krazy2-2.9/cppchecks/CMakeLists.txt 2010-06-28 11:41:31.993454611 -0500
+@@ -6,7 +6,6 @@ include(CheckCXXCompilerFlag)
+ set(QT_MIN_VERSION "4.5.0")
+ find_package(Qt4 REQUIRED)
+
+-set(CMAKE_INSTALL_RPATH ${CMAKE_PREFIX_PATH}/lib)
+ check_cxx_compiler_flag(-fvisibility=hidden __KRAZY_HAVE_GCC_VISIBILITY)
+ set( __KRAZY_HAVE_GCC_VISIBILITY ${__KDE_HAVE_GCC_VISIBILITY} CACHE BOOL "GCC support for hidden visibility")
+
diff --git a/krazy2.spec b/krazy2.spec
index 66b3201..49f698c 100644
--- a/krazy2.spec
+++ b/krazy2.spec
@@ -1,6 +1,9 @@
+
+%define snap 20100628
+
Name: krazy2
Version: 2.9
-Release: 5.20090928svn%{?dist}
+Release: 6.%{snap}svn%{?dist}
Summary: Krazy is a tool for checking code against the KDE coding guidelines
Group: Development/Libraries
@@ -8,13 +11,18 @@ License: GPLv2+
URL: http://techbase.kde.org/Development/Tutorials/Code_Checking
# The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
-# svn export -r 1029034 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.8
-# tar -c krazy2-2.9 | bzip2 --best -c > krazy2-2.9.tar.bz2
-Source0: krazy2-%{version}.tar.bz2
+# svn export -r 1143715 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.9
+# tar -c krazy2-2.9 | bzip2 --best -c > krazy2-2.9-%{snap}.tar.bz2
+Source0: krazy2-%{version}-%{snap}.tar.bz2
Source1: krazy-licensecheck
+# this is probably upstreamable too(?) -- Rex
Patch0: krazy2-prefix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+## upstreamable patches
+Patch50: krazy2-2.9-qt47.patch
+Patch51: krazy2-2.9-rpath.patch
+
# krazy-licensecheck moved from kdesdk to here in 4.2.0
Conflicts: kdesdk < 4.2.0
@@ -40,6 +48,8 @@ good reason.
%prep
%setup -q
%patch0
+%patch50 -p1 -b .qt47
+%patch51 -p1 -b .rpath
%build
@@ -50,8 +60,8 @@ pushd src/passbyvalue
make %{?_smp_mflags}
popd
pushd cppchecks
-%{cmake}
-make VERBOSE=1 %{?_smp_mflags}
+%{cmake} .
+make %{?_smp_mflags} VERBOSE=1
popd
@@ -93,7 +103,7 @@ install -m 644 -p kpartgui.dtd %{buildroot}%{_datadir}/dtd/kpartgui.dtd
install -m 644 -p kcfg.dtd %{buildroot}%{_datadir}/dtd/kcfg.dtd
popd
pushd doc
-make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
+make DESTDIR=%{buildroot} PREFIX=%{_prefix}/share install
popd
install -m 755 %{SOURCE1} %{buildroot}%{_bindir}/krazy-licensecheck
pushd cppchecks
@@ -136,6 +146,11 @@ rm -rf %{buildroot}
%changelog
+* Mon Jun 28 2010 Rex Dieter <rdieter at fedoraproject.rog> 2.9-6.20100628svn
+- Update snapshot
+- FTBFS krazy2-2.9-4.20090928svn.fc13 (#599851)
+- squash /lib rpaths
+
* Tue Jun 01 2010 Marcela Maslanova <mmaslano at redhat.com> - 2.9-5.20090928svn
- Mass rebuild with perl-5.12.0
diff --git a/sources b/sources
index 55b587a..3da8242 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eedb968c4a1236ff2b041fa40554aa6d krazy2-2.9.tar.bz2
+11803b0f8ae26826624ae760d879d227 krazy2-2.9-20100628.tar.bz2
More information about the scm-commits
mailing list