rpms/kdewebdev/F-7 .cvsignore, 1.14, 1.15 kdewebdev.spec, 1.37, 1.38 sources, 1.16, 1.17

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdewebdev/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4152

Modified Files:
	.cvsignore kdewebdev.spec sources 
Log Message:
* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-1
- 3.5.7
- +Requires(hint): gnupg tidy
- use Versioned Obsoletes/Provides: quanta



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/F-7/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	10 Aug 2006 16:21:11 -0000	1.14
+++ .cvsignore	11 Jun 2007 19:45:47 -0000	1.15
@@ -1,19 +1,5 @@
 css.tar.bz2
 html.tar.bz2
 javascript.tar.bz2
-kdewebdev-3.3.0.tar.bz2
 php_manual_en_20030401.tar.bz2
-kdewebdev-3.3.1.tar.bz2
-kdewebdev-3.3.2.tar.bz2
-tidy_src_041026.tgz
-kdewebdev-3.4.0-rc1.tar.bz2
-kdewebdev-3.4.0.tar.bz2
-kdewebdev-3.4.1.tar.bz2
-tidy_src_050803.tgz
-kdewebdev-3.4.2.tar.bz2
-kdewebdev-3.4.91.tar.bz2
-kdewebdev-3.4.92.tar.bz2
-kdewebdev-3.5.0.tar.bz2
-kdewebdev-3.5.1.tar.bz2
-kdewebdev-3.5.3.tar.bz2
-kdewebdev-3.5.4.tar.bz2
+kdewebdev-3.5.7.tar.bz2


Index: kdewebdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/F-7/kdewebdev.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- kdewebdev.spec	8 Feb 2007 10:00:19 -0000	1.37
+++ kdewebdev.spec	11 Jun 2007 19:45:47 -0000	1.38
@@ -1,20 +1,21 @@
+
 %define debug 0
 %define final 0
 %define make_cvs 1
 
-%define qt_version 3.3.7
-%define kde_version 3.5.6
+%define qt_version 3.3.8
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 
-Version: 3.5.6
+Name:    kdewebdev
+Summary: WEB Development package for the K Desktop Environment
+Epoch:   6
+Version: 3.5.7
 Release: 1%{?dist}
-Summary: WEB Development package for the K Desktop Environment.
-Name: kdewebdev
-Url: http://quanta.sourceforge.net/
-Epoch: 6
-Group: Applications/Editors
+
 License: GPL
+Url:     http://quanta.sourceforge.net/
+Group:   Applications/Editors
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -29,19 +30,18 @@
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-Requires: kdelibs >= %{kdelibs_epoch}:%{kde_version}
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires(hint): tidy
+Requires(hint): gnupg
 
-BuildRequires: qt-devel >= %{qt_version}
-BuildRequires: kdesdk-devel >= %{kde_version}
+BuildRequires: kdesdk-devel >= %{version}
 BuildRequires: perl
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
+%if %{make_cvs}
+BuildRequires: automake libtool
+%endif
 
-Obsoletes: WebMaker
-Obsoletes: quanta
+Obsoletes: quanta < %{epoch}:3.2.90
+Provides:  quanta = %{epoch}:%{version}-%{release}
 
 %description
 The kdewebdev package contains Quanta Plus and other applications, which are useful
@@ -53,8 +53,7 @@
 Summary: Header files and documentation for compiling kdewebdev applications.
 Requires: kdelibs-devel >= 1:%{qt_version}
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Obsoletes: quanta-devel
-
+Obsoletes: quanta-devel < %{epoch}:3.2.90
 %description devel
 This package includes the header files you will need to compile
 applications for kdewebdev.
@@ -65,31 +64,31 @@
 %patch0 -p0 -b .javascript
 %patch1 -p1 -b .kxsldbg-icons
 
-%build
-QTDIR="" && . /etc/profile.d/qt.sh
-
-cp %{SOURCE5} kxsldbg/
-
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
 
+
+%build
+QTDIR="" && . /etc/profile.d/qt.sh
+
+cp -p %{SOURCE5} kxsldbg/
+
 %configure \
    --enable-new-ldflags \
    --disable-dependency-tracking \
    --disable-rpath \
-   --disable-gcc-hidden-visibility \
 %if %{debug} == 0
    --disable-debug \
    --disable-warnings \
 %endif
 %if %{final}
-   --enable-final \
+   --enable-final 
 %endif
-   --with-qt-libraries=$QTDIR/lib
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 
@@ -133,9 +132,11 @@
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog NEWS README
@@ -158,7 +159,13 @@
 %{_libdir}/*.so
 %{_includedir}/*
 
+
 %changelog
+* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-1
+- 3.5.7
+- +Requires(hint): gnupg tidy
+- use Versioned Obsoletes/Provides: quanta
+
 * Thu Feb 08 2007 Than Ngo <than at redhat.com> 6:3.5.6-1.fc7
 - 3.5.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/F-7/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	8 Feb 2007 10:00:19 -0000	1.16
+++ sources	11 Jun 2007 19:45:47 -0000	1.17
@@ -2,4 +2,4 @@
 0cc3234c4b3df88d4115340ce05e0053  html.tar.bz2
 eea6e25a1c25af1f5a0c33e32e52c136  javascript.tar.bz2
 149607cecd4bf6783dc6e43a03b80138  php_manual_en_20030401.tar.bz2
-fa1fc2d7c81465c7e1762014a892ced3  kdewebdev-3.5.6.tar.bz2
+1329e0aea45947a14faa3d936f9edb5d  kdewebdev-3.5.7.tar.bz2