[krazy2] Update to latest master (2013-08-17)
Kevin Kofler
kkofler at fedoraproject.org
Sun Nov 17 02:18:53 UTC 2013
commit 9665bc8033d11ad003c1cb3c2276ca99db20c5a9
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sun Nov 17 03:17:40 2013 +0100
Update to latest master (2013-08-17)
* Sun Nov 17 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.90-21.20130817git8a0c3deb81ce2
- Update to latest master (8a0c3deb81ce219ebfa073480036d1a2e8237964, 2013-08-17)
- Drop upstreamed part of prefix patch, rename rest to krazy2-install-shlibs
- BuildRequires: perl(YAML)
.gitignore | 1 +
krazy2-install-shlibs.patch | 32 ++++++++++++++++++++++++++
krazy2-prefix.patch | 52 -------------------------------------------
krazy2.spec | 28 +++++++++++++----------
sources | 2 +-
5 files changed, 50 insertions(+), 65 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eaa16c4..96dec34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
krazy2-2.9-20100628.tar.bz2
/krazy2-2.90-20100926.tar.bz2
+/8a0c3deb81ce219ebfa073480036d1a2e8237964.tar.gz
diff --git a/krazy2-install-shlibs.patch b/krazy2-install-shlibs.patch
new file mode 100644
index 0000000..363b8a9
--- /dev/null
+++ b/krazy2-install-shlibs.patch
@@ -0,0 +1,32 @@
+diff -ur krazy-krazy/cppchecks/cplusplus/cppmodel/CMakeLists.txt krazy-krazy-install-shlibs/cppchecks/cplusplus/cppmodel/CMakeLists.txt
+--- krazy-krazy/cppchecks/cplusplus/cppmodel/CMakeLists.txt 2013-08-17 17:03:13.000000000 +0200
++++ krazy-krazy-install-shlibs/cppchecks/cplusplus/cppmodel/CMakeLists.txt 2013-11-17 03:07:55.000000000 +0100
+@@ -20,7 +20,5 @@
+ target_link_libraries(cppmodel preprocessor cpp_parser ${QT_QTCORE_LIBRARY})
+ set_target_properties(cppmodel PROPERTIES DEFINE_SYMBOL CPLUSPLUSMODEL_BUILD_LIB)
+
+-if(WIN32)
+ install(TARGETS cppmodel ${INSTALL_TARGETS_DEFAULT_ARGS})
+-endif(WIN32)
+
+diff -ur krazy-krazy/cppchecks/cplusplus/parser/CMakeLists.txt krazy-krazy-install-shlibs/cppchecks/cplusplus/parser/CMakeLists.txt
+--- krazy-krazy/cppchecks/cplusplus/parser/CMakeLists.txt 2013-08-17 17:03:13.000000000 +0200
++++ krazy-krazy-install-shlibs/cppchecks/cplusplus/parser/CMakeLists.txt 2013-11-17 03:07:55.000000000 +0100
+@@ -45,6 +45,4 @@
+ add_library(cpp_parser SHARED ${cplusplus_SRCS})
+ set_target_properties(cpp_parser PROPERTIES DEFINE_SYMBOL CPLUSPLUS_BUILD_LIB)
+
+-if(WIN32)
+ install(TARGETS cpp_parser ${INSTALL_TARGETS_DEFAULT_ARGS})
+-endif(WIN32)
+diff -ur krazy-krazy/cppchecks/cplusplus/preprocessor/CMakeLists.txt krazy-krazy-install-shlibs/cppchecks/cplusplus/preprocessor/CMakeLists.txt
+--- krazy-krazy/cppchecks/cplusplus/preprocessor/CMakeLists.txt 2013-08-17 17:03:13.000000000 +0200
++++ krazy-krazy-install-shlibs/cppchecks/cplusplus/preprocessor/CMakeLists.txt 2013-11-17 03:07:55.000000000 +0100
+@@ -17,7 +17,5 @@
+ target_link_libraries(preprocessor cpp_parser ${QT_QTCORE_LIBRARY})
+ set_target_properties(preprocessor PROPERTIES DEFINE_SYMBOL CPLUSPLUSPREPROCESSOR_BUILD_LIB)
+
+-if(WIN32)
+ install(TARGETS preprocessor ${INSTALL_TARGETS_DEFAULT_ARGS})
+-endif(WIN32)
+
diff --git a/krazy2.spec b/krazy2.spec
index 2d07ff1..1ba4dea 100644
--- a/krazy2.spec
+++ b/krazy2.spec
@@ -1,22 +1,18 @@
-
-%define snap 20100926
+%global snapdate 20130817
+%global snaphash 8a0c3deb81ce219ebfa073480036d1a2e8237964
Name: krazy2
Version: 2.90
-Release: 20.%{snap}svn%{?dist}
+Release: 21.%{snapdate}git%(echo %{snaphash} | cut -c -13)%{?dist}
Summary: Krazy is a tool for checking code against the KDE coding guidelines
Group: Development/Libraries
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 1179948 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.90
-# tar -c krazy2-2.90 | bzip2 --best -c > krazy2-2.90-%{snap}.tar.bz2
-Source0: krazy2-%{version}-%{snap}.tar.bz2
+Source0: https://gitorious.org/krazy/krazy/archive/%{snaphash}.tar.gz
Source1: krazy-licensecheck
-# this is probably upstreamable too(?) -- Rex
-Patch0: krazy2-prefix.patch
+# install the shared libraries (that are explicitly built as SHARED, not STATIC)
+Patch0: krazy2-install-shlibs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# krazy-licensecheck moved from kdesdk to here in 4.2.0
@@ -27,6 +23,7 @@ BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(HTML::Parser)
BuildRequires: perl(Tie::IxHash)
BuildRequires: perl(XML::LibXML)
+BuildRequires: perl(YAML)
# perldoc is now in separate package
BuildRequires: perl(Pod::Perldoc)
BuildRequires: qt4-devel
@@ -42,8 +39,10 @@ good reason.
%prep
-%setup -q
-%patch0
+%setup -q -n krazy-krazy
+%patch0 -p1 -b .install-shlibs
+# delete (two!) bundled copies of desktop-file-utils
+rm -rf src/desktop-file-utils-*
%build
@@ -147,6 +146,11 @@ rm -rf %{buildroot}
%changelog
+* Sun Nov 17 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.90-21.20130817git8a0c3deb81ce2
+- Update to latest master (8a0c3deb81ce219ebfa073480036d1a2e8237964, 2013-08-17)
+- Drop upstreamed part of prefix patch, rename rest to krazy2-install-shlibs
+- BuildRequires: perl(YAML)
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.90-20.20100926svn
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 916268d..87a5cb6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a16085591731cffcc5205d6ae338d39f krazy2-2.90-20100926.tar.bz2
+516c6a4280200745147cdcd30ee6437a 8a0c3deb81ce219ebfa073480036d1a2e8237964.tar.gz
More information about the scm-commits
mailing list