rpms/kiconedit/F-11 kiconedit.spec,1.16,1.17
Rex Dieter
rdieter at fedoraproject.org
Mon May 11 14:36:47 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/kiconedit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22716/F-11
Modified Files:
kiconedit.spec
Log Message:
* Mon May 11 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.3-2
- fix %_docdir/HTML/<lang> ownership
Index: kiconedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kiconedit/F-11/kiconedit.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- kiconedit.spec 8 May 2009 15:05:30 -0000 1.16
+++ kiconedit.spec 11 May 2009 14:36:17 -0000 1.17
@@ -2,7 +2,7 @@
Name: kiconedit
Version: 4.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: An icon editor
Group: Applications/Publishing
@@ -11,7 +11,7 @@ URL: http://www.kde.org
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: kdelibs4-devel >= %{version}
+#BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -44,13 +44,15 @@ rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%find_lang %{name}
-# HTML
-for lang_dir in %{buildroot}%{_docdir}/HTML/* ; do
- if [ -d $lang_dir ]; then
- lang=$(basename $lang_dir)
- echo "%lang($lang) %doc %{_docdir}/HTML/$lang" >> %{name}.lang
+HTML_DIR=$(kde4-config --expandvars --install html)
+if [ -d %{buildroot}${HTML_DIR} ]; then
+for lang_dir in %{buildroot}${HTML_DIR}/* ; do
+ if [ -d ${lang_dir} ]; then
+ lang=$(basename ${lang_dir})
+ echo "%lang(${lang}) ${HTML_DIR}/${lang}/%{name}/" >> %{name}.lang
fi
done
+fi
%check
@@ -82,11 +84,13 @@ gtk-update-icon-cache %{_datadir}/icons/
%{_kde4_bindir}/kiconedit
%{_kde4_appsdir}/kiconedit/
%{_kde4_datadir}/applications/kde4/kiconedit.desktop
-%{_kde4_docdir}/HTML/en/kiconedit/
%{_kde4_iconsdir}/hicolor/*/*/*
%changelog
+* Mon May 11 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.3-2
+- fix %%_docdir/HTML/<lang> ownership
+
* Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.3-1
- 4.2.3
- optimize scriptlets
More information about the scm-commits
mailing list