Author: qboosh Date: Wed Feb 6 18:00:29 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- reformatted wrt. multibyte chars
- pl for -shared
- moved checkXML(1) manual to proper package
- avoid creating empty -apidocs
---- Files affected:
SPECS:
kde4-kdelibs.spec (1.39 -> 1.40)
---- Diffs:
================================================================
Index: SPECS/kde4-kdelibs.spec
diff -u SPECS/kde4-kdelibs.spec:1.39 SPECS/kde4-kdelibs.spec:1.40
--- SPECS/kde4-kdelibs.spec:1.39 Wed Feb 6 18:10:06 2008
+++ SPECS/kde4-kdelibs.spec Wed Feb 6 19:00:24 2008
@@ -96,13 +96,13 @@
BuildRequires: utempter-devel
BuildRequires: zlib-devel
Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-shared = %{version}-%{release}
Requires: QtCore >= 4.2.0
Requires: docbook-dtd412-xml
Requires: docbook-dtd42-xml
Requires: docbook-style-xsl
Requires: hicolor-icon-theme
Requires: kde-common-dirs
-Requires: kde4-kdelibs-shared = %{version}-%{release}
Requires: setup >= 2.4.6-7
Requires: xorg-app-iceauth
Obsoletes: kdelibs4
@@ -110,8 +110,8 @@
Conflicts: kdelibs4
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _kde_prefix %{_prefix}
-%define _kde_libdir %{_libdir}
+%define _kde_prefix %{_prefix}
+%define _kde_libdir %{_libdir}
%define _kde_share_dir %{_datadir}
%define _kde_html_dir %{_kdedocdir}
%define _kde_config_dir %{_datadir}/config
@@ -210,17 +210,15 @@
pisaniu własnych programów wykorzystujących kdelibs.
%description devel -l pt_BR.UTF-8
-Este pacote contém os arquivos de inclusão que são necessários
-para compilar aplicativos KDE.
+Este pacote contém os arquivos de inclusão que são necessários para
+compilar aplicativos KDE.
%description devel -l ru.UTF-8
-Этот пакет содержит хедеры,
-необходимые для компиляции программ
-для KDE.
+Этот пакет содержит хедеры, необходимые для компиляции программ для
+KDE.
%description devel -l uk.UTF-8
-Цей пакет містить хедери, необхідні
-для компіляції програм для KDE.
+Цей пакет містить хедери, необхідні для компіляції програм для KDE.
%package apidocs
Summary: API documentation
@@ -242,13 +240,17 @@
- listę przestrzeni nazw (namespace)
%package shared
-Summary: KDE3 and KDE4 shared files
+Summary: KDE 3 and KDE 4 shared files
+Summary(pl.UTF-8): Pliki współdzielone między KDE 3 i KDE 4
Group: X11/Libraries
Provides: kdelibs-shared
Obsoletes: kdelibs-shared
%description shared
-KDE3 and KDE4 shared files
+KDE 3 and KDE 4 shared files.
+
+%description shared -l pl.UTF-8
+Pliki współdzielone między KDE 3 i KDE 4.
%prep
%setup -q -n %{orgname}-%{version}
@@ -279,8 +281,8 @@
%install
rm -rf $RPM_BUILD_ROOT
-cd build
-%{__make} install \
+
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
install -d \
@@ -339,7 +341,6 @@
%dir %{_datadir}/apps/nepomuk/pics
%{_datadir}/apps/nepomuk/pics/rating.png
%{_kdedocdir}/en/sonnet
-%{_mandir}/man1/checkXML.1*
%{_mandir}/man1/kde4-config.1*
%{_mandir}/man7/kdeoptions.7*
%{_mandir}/man7/qtoptions.7*
@@ -494,8 +495,8 @@
%{_datadir}/apps/cmake
%if %{with apidocs}
-%files apidocs
-%defattr(644,root,root,755)
+#%files apidocs
+#%defattr(644,root,root,755)
#%{_kdedocdir}/en/%{name}*-apidocs
%endif
@@ -506,26 +507,27 @@
%attr(755,root,root) %{_bindir}/makekdewidgets
%{_datadir}/apps/katepart
%{_datadir}/apps/kcm_componentchooser
+%dir %{_datadir}/apps/kconf_update
%attr(755,root,root) %{_datadir}/apps/kconf_update/*.sh
%{_datadir}/apps/kdeui
%{_datadir}/apps/kdewidgets
+%dir %{_datadir}/apps/khtml
+%dir %{_datadir}/apps/khtml/css
%{_datadir}/apps/khtml/css/html4.css
%{_datadir}/apps/khtml/css/quirks.css
%{_datadir}/apps/khtml/khtml_browser.rc
+%dir %{_datadir}/apps/kjava
%{_datadir}/apps/kjava/kjava.jar
%{_datadir}/apps/ksgmltools2
%{_datadir}/apps/kssl
+%dir %{_datadir}/config
+%dir %{_datadir}/config/ui
%{_datadir}/config/ui/ui_standards.rc
%{_datadir}/config/kdebug.areas
%{_datadir}/config/kdebugrc
-%lang(en) %{_kdedocdir}/en/common
%{_datadir}/locale/all_languages
-%dir %{_datadir}/apps/khtml
-%dir %{_datadir}/apps/khtml/css
-%dir %{_datadir}/apps/kjava
-%dir %{_datadir}/config
-%dir %{_datadir}/config/ui
-%dir %{_datadir}/apps/kconf_update
+%{_mandir}/man1/checkXML.1*
+%lang(en) %{_kdedocdir}/en/common
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -533,6 +535,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.40 2008-02-06 18:00:24 qboosh
+- reformatted wrt. multibyte chars
+- pl for -shared
+- moved checkXML(1) manual to proper package
+- avoid creating empty -apidocs
+
Revision 1.39 2008-02-06 17:10:06 shadzik
- rename kdelibs-shared to kde4-kdelibs-shared again
this is rather a good idea due problems with kde3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdelibs.spec?r1=1.39&r2=1.40&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
