rpms/krazy2/F-10 krazy2-prefix.patch, NONE, 1.1 krazy2.spec, 1.4, 1.5 sources, 1.5, 1.6

Ben Boeckel mathstuf at fedoraproject.org
Mon Jul 20 15:56:59 UTC 2009


Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10693

Modified Files:
	krazy2.spec sources 
Added Files:
	krazy2-prefix.patch 
Log Message:
Update SVN snapshot

krazy2-prefix.patch:
 checks/dpointercheck/CMakeLists.txt   |    2 +-
 cplusplus/cppmodel/CMakeLists.txt     |    2 --
 cplusplus/parser/CMakeLists.txt       |    2 --
 cplusplus/preprocessor/CMakeLists.txt |    2 --
 4 files changed, 1 insertion(+), 7 deletions(-)

--- NEW FILE krazy2-prefix.patch ---
diff -U 5 -r cppchecks/checks/dpointercheck/CMakeLists.txt cppchecks/checks/dpointercheck/CMakeLists.txt
--- cppchecks/checks/dpointercheck/CMakeLists.txt	2009-03-13 09:57:03.000000000 -0400
+++ cppchecks/checks/dpointercheck/CMakeLists.txt	2009-03-22 18:05:47.000000000 -0400
@@ -12,9 +12,9 @@
 
 add_executable(dpointercheck ${DPointerCheck_SRCS})
 
 target_link_libraries(dpointercheck checkutil cppmodel)
 if(NOT WIN32)
-install(TARGETS dpointercheck DESTINATION ${CMAKE_PREFIX_PATH}/lib/krazy2/krazy-extras/c++)
+install(TARGETS dpointercheck DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/krazy2/krazy-extras/c++)
 else(NOT WIN32)
 install(TARGETS dpointercheck ${INSTALL_TARGETS_DEFAULT_ARGS})
 endif(NOT WIN32)
diff -U 5 -r cppchecks/cplusplus/cppmodel/CMakeLists.txt cppchecks/cplusplus/cppmodel/CMakeLists.txt
--- cppchecks/cplusplus/cppmodel/CMakeLists.txt	2009-03-19 12:37:12.000000000 -0400
+++ cppchecks/cplusplus/cppmodel/CMakeLists.txt	2009-03-22 18:11:22.000000000 -0400
@@ -18,9 +18,7 @@
 add_library(cppmodel SHARED ${cppmodel_SRCS})
 
 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 -U 5 -r cppchecks/cplusplus/parser/CMakeLists.txt cppchecks/cplusplus/parser/CMakeLists.txt
--- cppchecks/cplusplus/parser/CMakeLists.txt	2009-02-23 17:03:51.000000000 -0500
+++ cppchecks/cplusplus/parser/CMakeLists.txt	2009-03-22 18:11:03.000000000 -0400
@@ -41,8 +41,6 @@
 include_directories(${QT_INCLUDES})
 
 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 -U 5 -r cppchecks/cplusplus/preprocessor/CMakeLists.txt cppchecks/cplusplus/preprocessor/CMakeLists.txt
--- cppchecks/cplusplus/preprocessor/CMakeLists.txt	2009-03-13 09:57:03.000000000 -0400
+++ cppchecks/cplusplus/preprocessor/CMakeLists.txt	2009-03-22 18:11:15.000000000 -0400
@@ -15,9 +15,7 @@
 add_library(preprocessor SHARED ${preproc_SRCS})
 
 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)
 


Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-10/krazy2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- krazy2.spec	29 Jan 2009 23:48:10 -0000	1.4
+++ krazy2.spec	20 Jul 2009 15:56:28 -0000	1.5
@@ -2,8 +2,8 @@
 %define kdp 0
 
 Name:           krazy2
-Version:        2.8
-Release:        7.20090127svn%{?dist}
+Version:        2.9
+Release:        2.20090719svn%{?dist}
 Summary:        Krazy is a tool for checking code against the KDE coding guidelines
 
 Group:          Development/Libraries
@@ -11,10 +11,13 @@ 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 917270 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.8
-#  tar -c krazy2-2.8 | bzip2 --best -c > krazy2-2.8.tar.bz2
+#  svn export -r 999498 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
 Source1:        krazy-licensecheck
+%if 0%{?kdp}
+Patch0:         krazy2-prefix.patch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # krazy-licensecheck moved from kdesdk to here in 4.2.0
@@ -43,6 +46,9 @@ good reason.
 
 %prep
 %setup -q
+%if 0%{?kdp}
+%patch0
+%endif
 
 
 %build
@@ -98,15 +104,12 @@ install -m 644 -p kpartgui.dtd %{buildro
 install -m 644 -p kcfg.dtd %{buildroot}%{_datadir}/dtd/kcfg.dtd
 popd
 pushd doc
-make DESTDIR=%{buildroot}%{_mandir} install
+make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 popd
 install -m 644 %{SOURCE1} %{buildroot}%{_bindir}/krazy-licensecheck
 %if 0%{?kdp}
 pushd cppchecks
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
-# No headers installed
-rm -rf %{buildroot}%{_libdir}/libc++parser.so
-rm -rf %{buildroot}%{_libdir}/libcheckutil.so
 popd
 %endif
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
@@ -116,9 +119,6 @@ find %{buildroot} -depth -type d -exec r
 # chmod -R ug+w %{buildroot}%{_libdir}
 
 
-%check
-
-
 %clean
 rm -rf %{buildroot}
 
@@ -129,14 +129,18 @@ rm -rf %{buildroot}
 %{_mandir}/man1/krazy2.1.gz
 %{_mandir}/man1/krazy2all.1.gz
 %{_mandir}/man1/krazy2ebn.1.gz
+%{_mandir}/man1/krazy2xml.1.gz
 %{_mandir}/man5/krazyrc.5.gz
 %{_bindir}/krazy-licensecheck
 %{_bindir}/krazy2
 %{_bindir}/krazy2all
 %{_bindir}/krazy2ebn
+%{_bindir}/krazy2xml
 %if 0%{?kdp}
-%{_libdir}/libc++parser.so.1
-%{_libdir}/libc++parser.so.1.0
+%{_libdir}/libcpp_parser.so
+%{_libdir}/libcppmodel.so
+%{_libdir}/libpreprocessor.so
+%{_libdir}/libcheckutil.so
 %{_libdir}/libcheckutil.so.1
 %{_libdir}/libcheckutil.so.1.0
 %endif
@@ -146,7 +150,23 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Thu Jan 29 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-6.20090127svn
+* Mon Jul 20 2009 Ben Boeckel <MathStuf at gmail.com> 2.9-2.20090719svn
+- Fix %%changelog
+- Fix CVS mistakes (update tarball)
+
+* Mon Jul 20 2009 Ben Boeckel <MathStuf at gmail.com> 2.9-1.20090719svn
+- Updated SVN
+- Conditionalize patch
+- Fix DESTDIR/PREFIX for doc
+- Remove %%check section
+
+* Mon Mar 16 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-9.20090314svn
+- Updated SVN
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8-8.20090127svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Jan 29 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-7.20090127svn
 - Updated SVN
 
 * Sat Jan 24 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-6.20090113svn916151


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	29 Jan 2009 23:48:10 -0000	1.5
+++ sources	20 Jul 2009 15:56:28 -0000	1.6
@@ -1 +1 @@
-7dfdeb7b17b3995e0fe7a6f9e0c902e2  krazy2-2.8.tar.bz2
+0b2513f67f8ae516a5d7042590080efe  krazy2-2.9.tar.bz2




More information about the fedora-extras-commits mailing list