rpms/kdewebdev/F-7 .cvsignore, 1.15, 1.16 kdewebdev.spec, 1.39, 1.40 sources, 1.17, 1.18 hi48-app-kxsldbg.png, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kdewebdev.spec sources 
Removed Files:
	hi48-app-kxsldbg.png 
Log Message:
sync w/devel (kde-3.5.8)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/F-7/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	11 Jun 2007 19:45:47 -0000	1.15
+++ .cvsignore	1 Nov 2007 17:36:18 -0000	1.16
@@ -3,3 +3,5 @@
 javascript.tar.bz2
 php_manual_en_20030401.tar.bz2
 kdewebdev-3.5.7.tar.bz2
+hi48-app-kxsldbg.png
+kdewebdev-3.5.8.tar.bz2


Index: kdewebdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/F-7/kdewebdev.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kdewebdev.spec	17 Jun 2007 21:43:47 -0000	1.39
+++ kdewebdev.spec	1 Nov 2007 17:36:18 -0000	1.40
@@ -1,20 +1,19 @@
 
-%define debug 0
-%define final 0
 %define make_cvs 1
 
-%define qt_version 3.3.8
-%define kdelibs_epoch 6
-%define kdebase_epoch 6
+%if 0%{?fedora} > 7
+# make -libs subpkg
+%define libs 1
+%endif
 
 Name:    kdewebdev
-Summary: WEB Development package for the K Desktop Environment
+Summary: Web development applications 
 Epoch:   6
-Version: 3.5.7
-Release: 1%{?dist}
+Version: 3.5.8
+Release: 3%{?dist}
 
-License: GPL
-Url:     http://quanta.sourceforge.net/
+License: GPLv2
+Url:     http://kdewebdev.org/ 
 Group:   Applications/Editors
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,35 +27,67 @@
 Patch0: javascript.patch
 Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch
 
+%if %{make_cvs}
+BuildRequires: automake libtool
+%endif BuildRequires: desktop-file-utils
+BuildRequires: kdelibs3-devel >= %{version}
+BuildRequires: kdesdk3-devel >= %{version}
+BuildRequires: libxslt-devel libxml2-devel
+BuildRequires: perl
+
+%if 0%{?libs}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+%else
+Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:  %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
-Requires(hint): tidy
+%endif
+
+# optional
 Requires(hint): gnupg
+Requires(hint): tidy
 
-BuildRequires: kdesdk-devel
-BuildRequires: perl
-%if %{make_cvs}
-BuildRequires: automake libtool
-%endif
+Provides: kdewebdev3 = %{version}-%{release}
 
-Obsoletes: quanta < %{epoch}:3.2.90
+Obsoletes: quanta < %{epoch}:%{version}-%{release}
 Provides:  quanta = %{epoch}:%{version}-%{release}
 
+%define kommander_ver 1.2.2
+#Obsoletes: kommander < %{kommander_ver}-%{release}
+Provides:  kommander = %{kommander_ver}-%{release}
+
 %description
-The kdewebdev package contains Quanta Plus and other applications, which are useful
-for web development. They are runtime dependencies of Quanta Plus, and it is
-highly recommended that you install them.
+%{summary}, including:
+* kfilereplace: batch search and replace tool
+* kimagemapeditor: HTML image map editor
+* klinkstatus: link checker
+* kommander: visual dialog building tool
+* kxsldbg: xslt Debugger
+* quanta+: web development
 
 %package devel
 Group: Development/Libraries
-Summary: Header files and documentation for compiling kdewebdev applications.
-Requires: kdelibs-devel >= 1:%{qt_version}
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Obsoletes: quanta-devel < %{epoch}:3.2.90
+Summary: Header files and documentation for %{name} 
+Provides: kdewebdev3-devel = %{version}-%{release}
+Requires: kdelibs3-devel
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Obsoletes: quanta-devel < %{epoch}:%{version}-%{release}
 %description devel
-This package includes the header files you will need to compile
-applications for kdewebdev.
+%{summary}.
+
+%if 0%{?libs}
+%package libs
+Summary: %{name} runtime libraries
+Group:   System Environment/Libraries
+Requires: kdelibs3 >= %{version}
+# helps multilib upgrades
+Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release}
+# include to be paranoid, installing libs-only is still mostly untested -- Rex
+#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%description libs
+%{summary}.
+%endif
 
 
 %prep
@@ -64,27 +95,22 @@
 %patch0 -p0 -b .javascript
 %patch1 -p1 -b .kxsldbg-icons
 
+install -m644 -p %{SOURCE5} kxsldbg/
+
 %if %{make_cvs}
   make -f admin/Makefile.common cvs
 %endif
 
 
 %build
-QTDIR="" && . /etc/profile.d/qt.sh
-
-cp -p %{SOURCE5} kxsldbg/
+unset QTDIR && . /etc/profile.d/qt.sh
 
 %configure \
-   --enable-new-ldflags \
-   --disable-dependency-tracking \
-   --disable-rpath \
-%if %{debug} == 0
-   --disable-debug \
-   --disable-warnings \
-%endif
-%if %{final}
-   --enable-final 
-%endif
+  --includedir=%{_includedir}/kde \
+  --disable-rpath \
+  --enable-new-ldflags \
+  --disable-debug --disable-warnings \
+  --disable-dependancy-tracking --enable-final \
 
 make %{?_smp_mflags}
 
@@ -92,8 +118,9 @@
 %install
 rm -rf %{buildroot}
 
-make DESTDIR=%{buildroot} install
+make install DESTDIR=%{buildroot}
 
+## package separately?  Why doesn't upstream include this? -- Rex
 # install docs
 for i in css html javascript ; do
    pushd $i
@@ -103,21 +130,28 @@
    popd
    rm -rf $i
 done
+cp -a php php.docrc %{buildroot}%{_datadir}/apps/quanta/doc/
 
-cp -R php php.docrc %{buildroot}%{_datadir}/apps/quanta/doc
-
-# fix dangling symlinks
+# make symlinks relative
 pushd %{buildroot}%{_docdir}/HTML/en
 for i in *; do
    if [ -d $i -a -L $i/common ]; then
       rm -f $i/common
-      ln -s ../common $i
+      ln -nfs ../common $i
    fi
 done
 popd
 
+# rpmdocs
+for dir in k* quanta; do
+  for file in AUTHORS ChangeLog README TODO ; do
+    test -s  "$dir/$file" && install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
+  done
+done
+
+
 %post
-/sbin/ldconfig
+%{!?libs:/sbin/ldconfig}
 for f in crystalsvg hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
@@ -125,42 +159,74 @@
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-/sbin/ldconfig
+%{!?libs:/sbin/ldconfig}
 for f in crystalsvg hicolor locolor ; do
   touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
   gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
 done
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
+%if 0%{?libs}
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+%endif
+
 
 %clean
 rm -rf %{buildroot}
 
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog NEWS README
-%doc %{_docdir}/HTML/en/*
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%doc rpmdocs/*
 %{_bindir}/*
-%{_libdir}/*.so.*
-%{_libdir}/*.la
 %{_libdir}/kde3/*
 %{_datadir}/applications/kde/*
 %{_datadir}/applnk/.hidden/*
 %{_datadir}/apps/*
+%doc %{_datadir}/apps/quanta/doc
 %{_datadir}/config.kcfg/*
-%{_datadir}/icons/*/*/*/*
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/application/*
 %{_datadir}/services/*
 %{_datadir}/servicetypes/*
+%{_docdir}/HTML/en/*
+
+%if 0%{?libs}
+%files libs
+%defattr(-,root,root,-)
+%endif
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
 
 %files devel
-%defattr(-,root,root)
-%{_libdir}/*.so
-%{_includedir}/*
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so
+%{_includedir}/kde/*
 
 
 %changelog
+* Tue Oct 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-3
+- -libs: Obsoletes: %%name ... to help out multilib upgrades
+- -libs conditional (f8+)
+
+* Mon Oct 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-2
+- -libs subpkg (more multilib friendly
+- kommander_ver 1.2.2
+
+* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-1
+- kde-3.5.8
+
+* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-2
+- License: GPLv2
+- update %%description
+- Provides: kdewebdev3 kommander 
+- BR: kdelibs3
+
 * Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-1
 - 3.5.7
 - +Requires(hint): gnupg tidy


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/F-7/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	11 Jun 2007 19:45:47 -0000	1.17
+++ sources	1 Nov 2007 17:36:18 -0000	1.18
@@ -2,4 +2,5 @@
 0cc3234c4b3df88d4115340ce05e0053  html.tar.bz2
 eea6e25a1c25af1f5a0c33e32e52c136  javascript.tar.bz2
 149607cecd4bf6783dc6e43a03b80138  php_manual_en_20030401.tar.bz2
-1329e0aea45947a14faa3d936f9edb5d  kdewebdev-3.5.7.tar.bz2
+b2242db588538fb5f02bd0de196a872b  hi48-app-kxsldbg.png
+6c17c4b71a4d306da4b81a0cfd3116e1  kdewebdev-3.5.8.tar.bz2