rpms/krazy2/devel krazy2.spec,1.8,1.9 sources,1.5,1.6

[Ben Boeckel]

Author: mathstuf

Update of /cvs/pkgs/rpms/krazy2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12336

Modified Files:
	krazy2.spec sources 
Log Message:
Cleaner specfile and patches are now upstream


Index: krazy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/devel/krazy2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- krazy2.spec	13 Jan 2009 23:32:30 -0000	1.8
+++ krazy2.spec	24 Jan 2009 18:36:18 -0000	1.9
@@ -1,6 +1,9 @@
+# Set to 1 if kdevplatform is available
+%define kdp 0
+
 Name:           krazy2
 Version:        2.8
-Release:        5.20090111svn909634%{?dist}
+Release:        6.20090113svn916151%{?dist}
 Summary:        Krazy is a tool for checking code against the KDE coding guidelines
 
 Group:          Development/Libraries
@@ -8,13 +11,12 @@
 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 909634 svn://anonsvn.kde.org/home/kde/trunk/quality/krazy2 krazy2-2.8
+#  svn export -r 916151 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
 Source0:        krazy2-%{version}.tar.bz2
 # TODO: Remove if/when 4.2 hits F9 and F10
 %if 0%{?fedora} > 10
 Source1:        krazy-licensecheck
-Patch0:         checkutil-libsuffix.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,10 +26,11 @@
 BuildRequires:  perl(Tie::IxHash)
 BuildRequires:  perl(XML::LibXML)
 BuildRequires:  qt4-devel
-# FIXME: Needs KDevPlatform4
-# BuildRequires:  cmake
-# BuildRequires:  kdelibs4-devel
-# BuildRequires:  kdevplatform-devel
+%if 0%{?kdp}
+BuildRequires:  cmake
+BuildRequires:  kdelibs4-devel
+BuildRequires:  kdevplatform-devel
+%endif
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 # Krazy2 uses desktop-file-validate, so this is an actual Requires
 Requires:       desktop-file-utils
@@ -40,9 +43,6 @@
 
 %prep
 %setup -q
-%if 0%{?fedora} > 10
-%patch0
-%endif
 
 
 %build
@@ -52,15 +52,16 @@
 %{_qt4_qmake}
 make %{?_smp_mflags}
 popd
-# FIXME: Needs KDevelop4
-#pushd cppchecks
-#{cmake}
-#make VERBOSE=1 %{?_smp_mflags}
-#popd
+%if 0%{?kdp}
+pushd cppchecks
+%{cmake}
+make VERBOSE=1 %{?_smp_mflags}
+popd
+%endif
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 chmod 0755 %{buildroot}%{_bindir}/krazy2{,all,ebn}
 pushd helpers
@@ -99,16 +100,20 @@
 pushd doc
 make DESTDIR=%{buildroot}%{_mandir} install
 popd
-%if 0%{fedora} > 10
+%if 0%{?fedora} > 10
 install -m 644 %{SOURCE1} %{buildroot}%{_bindir}/krazy-licensecheck
 %endif
-# FIXME: Needs KDevelop4
-# pushd cppchecks
-# make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
-# popd
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
+%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 {} ';'
+find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';'
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
 # chmod -R ug+w %{buildroot}%{_bindir}
 # chmod -R ug+w %{buildroot}%{_libdir}
 
@@ -117,7 +122,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -133,12 +138,22 @@
 %{_bindir}/krazy2
 %{_bindir}/krazy2all
 %{_bindir}/krazy2ebn
-%{_libdir}/krazy2
-%{_datadir}/dtd
-%{perl_vendorlib}/Krazy
+%if 0%{?kdp}
+%{_libdir}/libc++parser.so.1
+%{_libdir}/libc++parser.so.1.0
+%{_libdir}/libcheckutil.so.1
+%{_libdir}/libcheckutil.so.1.0
+%endif
+%{_libdir}/krazy2/
+%{_datadir}/dtd/
+%{perl_vendorlib}/Krazy/
 
 
 %changelog
+* Sat Jan 24 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-6.20090113svn916151
+- Added flag for building with kdevplatform
+- Removed patches applied upstream
+
 * Tue Jan 13 2009 Ben Boeckel <MathStuf at gmail.com> 2.8-5.20090111svn909634
 - Typo with sources
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krazy2/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Jan 2009 23:04:36 -0000	1.5
+++ sources	24 Jan 2009 18:36:18 -0000	1.6
@@ -1 +1 @@
-e0507238f2643be52e9edae5e2059c7d  krazy2-2.8.tar.bz2
+242362beb2dc5c636d9810c592d115d1  krazy2-2.8.tar.bz2