rpms/kdewebdev/devel .cvsignore, 1.14, 1.15 kdewebdev.spec, 1.37, 1.38 sources, 1.16, 1.17
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Sep 13 13:08:00 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdewebdev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6050
Modified Files:
.cvsignore kdewebdev.spec sources
Log Message:
* Thu Sep 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.7-2
- License: GPLv2
- update %description
- Provides: kdewebdev3 kommander
- BR: kdelibs3
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdewebdev/devel/.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 13 Sep 2007 13:07:26 -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/devel/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 13 Sep 2007 13:07:26 -0000 1.38
@@ -1,20 +1,15 @@
-%define debug 0
-%define final 0
+
%define make_cvs 1
-%define qt_version 3.3.7
-%define kde_version 3.5.6
-%define kdelibs_epoch 6
-%define kdebase_epoch 6
-
-Version: 3.5.6
-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
+Name: kdewebdev
+Summary: Web development applications
+Epoch: 6
+Version: 3.5.7
+Release: 2%{?dist}
+
+License: GPLv2
+Url: http://kdewebdev.org/
+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
@@ -27,37 +22,49 @@
Patch0: javascript.patch
Patch1: kdewebdev-3.5.4-kxsldbg-icons.patch
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires: kdelibs >= %{kdelibs_epoch}:%{kde_version}
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
-
-BuildRequires: qt-devel >= %{qt_version}
-BuildRequires: kdesdk-devel >= %{kde_version}
+%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
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-Obsoletes: WebMaker
-Obsoletes: quanta
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires: kdelibs3 >= %{version}
+# optional
+Requires(hint): gnupg
+Requires(hint): tidy
+
+Provides: kdewebdev3 = %{version}-%{release}
+
+Obsoletes: quanta < %{epoch}:%{version}-%{release}
+Provides: quanta = %{epoch}:%{version}-%{release}
+
+%define kommander_ver 1.2.1
+#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}
+Summary: Header files and documentation for %{name}
+Provides: kdewebdev3-devel = %{version}-%{release}
+Requires: kdelibs3-devel
Requires: %{name} = %{epoch}:%{version}-%{release}
-Obsoletes: quanta-devel
-
+Obsoletes: quanta-devel < %{epoch}:%{version}-%{release}
%description devel
-This package includes the header files you will need to compile
-applications for kdewebdev.
+%{summary}.
%prep
@@ -65,36 +72,32 @@
%patch0 -p0 -b .javascript
%patch1 -p1 -b .kxsldbg-icons
-%build
-QTDIR="" && . /etc/profile.d/qt.sh
-
-cp %{SOURCE5} kxsldbg/
+install -m644 -p %{SOURCE5} kxsldbg/
%if %{make_cvs}
make -f admin/Makefile.common cvs
%endif
+
+%build
+unset QTDIR && . /etc/profile.d/qt.sh
+
%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 \
-%endif
- --with-qt-libraries=$QTDIR/lib
+ --includedir=%{_includedir}/kde \
+ --disable-rpath \
+ --enable-new-ldflags \
+ --disable-debug --disable-warnings \
+ --disable-dependancy-tracking --enable-final \
make %{?_smp_mflags}
+
%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
@@ -104,19 +107,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
for f in crystalsvg hicolor locolor ; do
@@ -133,32 +145,50 @@
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
%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}/lib*.so.*
+%{_libdir}/lib*.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/*
%files devel
-%defattr(-,root,root)
-%{_libdir}/*.so
-%{_includedir}/*
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so
+%{_includedir}/kde/*
+
%changelog
+* 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
+- 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/devel/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 13 Sep 2007 13:07:26 -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
More information about the fedora-extras-commits
mailing list