rpms/kde-filesystem/devel kde-filesystem.spec,1.4.2.8,1.4.2.9
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Fri Aug 10 15:23:06 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kde-filesystem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6946
Modified Files:
Tag: kde-filesystem-kde4-branch
kde-filesystem.spec
Log Message:
* Fri Aug 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-6
- restore kde3 dirs
Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/kde-filesystem.spec,v
retrieving revision 1.4.2.8
retrieving revision 1.4.2.9
diff -u -r1.4.2.8 -r1.4.2.9
--- kde-filesystem.spec 9 Aug 2007 13:46:58 -0000 1.4.2.8
+++ kde-filesystem.spec 10 Aug 2007 15:22:33 -0000 1.4.2.9
@@ -15,7 +15,7 @@
Summary: KDE filesystem layout
Name: kde-filesystem
Version: 3.92
-Release: 5
+Release: 6
Group: System Environment/Base
License: Public Domain
@@ -40,10 +40,25 @@
%install
+rm -f $RPM_BUILD_DIR/%{name}.list
rm -rf $RPM_BUILD_ROOT
-# FIXME/TODO: (re)add kde3-specific dirs -- Rex
+## KDE3
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/{env,shutdown}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/{env,shutdown,kdm,xdg/menus}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/{applications/kde,applnk,apps,autostart,config,config.kcfg,desktop-directories,emoticons,mimelnk,services,servicetypes,sounds,templates,source,wallpapers}
+# not sure who best should own locolor, so we'll included it here, for now. -- Rex
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/{16x16,22x22,32x32,48x48}/{actions,apps,mimetypes}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/{.hidden,Applications,Edutainment,Graphics,Internet,Settings,System,Toys,Utilities}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/mimelnk/{all,application,audio,fonts,image,inode,interface,media,message,model,multipart,print,text,uri,video}
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/en
+for locale in $(grep '=' %{SOURCE1} | awk -F= '{print $1}') ; do
+ mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/${locale}/
+ echo "%lang($locale) %{_docdir}/HTML/$locale/" >> %{name}.list
+done
+
+## KDE4
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm \
-p $RPM_BUILD_ROOT%{_kde4_prefix}/env \
-p $RPM_BUILD_ROOT%{_kde4_prefix}/shutdown \
@@ -78,13 +93,12 @@
-p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/48x48/mimetypes \
-p $RPM_BUILD_ROOT%{_kde4_docdir}/HTML/en
-rm -f %{name}.list
for locale in $(grep '=' %{SOURCE1} | awk -F= '{print $1}') ; do
mkdir -p $RPM_BUILD_ROOT%{_kde4_docdir}/HTML/${locale}/
echo "%lang($locale) %{_kde4_docdir}/HTML/$locale/" >> %{name}.list
done
-# kde rpm macros
+# rpm macros
cat >$RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4<<EOF
%%_kde4_prefix %%_prefix
%%_kde4_sysconfdir %%_sysconfdir
@@ -109,10 +123,33 @@
%files -f %{name}.list
%defattr(-,root,root,-)
+
+# KDE3
+%{_prefix}/env/
+%{_prefix}/shutdown/
+%{_sysconfdir}/kde/
+%{_datadir}/applications/kde/
+%{_datadir}/applnk/
+%{_datadir}/apps/
+%{_datadir}/config/
+%{_datadir}/config.kcfg/
+%{_datadir}/desktop-directories/
+%{_datadir}/emoticons/
+%{_datadir}/icons/locolor
+%{_datadir}/mimelnk/
+%{_datadir}/services/
+%{_datadir}/servicetypes/
+%{_datadir}/sounds/
+%{_datadir}/templates/
+%{_datadir}/wallpapers/
+%dir %{_docdir}/HTML/
+%lang(en) %{_docdir}/HTML/en/
+
+# KDE4
%config /etc/rpm/macros.kde4
%{_kde4_prefix}/env/
%{_kde4_prefix}/shutdown/
-%{_sysconfdir}/kde4/
+%{_kde4_sysconfdir}/kde4/
%{_kde4_libdir}
%{_kde4_datadir}/applications/kde4/
%{_kde4_appsdir}/
@@ -126,12 +163,14 @@
%{_kde4_sharedir}/templates/
%{_kde4_datadir}/wallpapers/
%{_kde4_datadir}/sounds/
-
-%dir %{_kde_docdir}/HTML/
-%lang(en) %{_kde_docdir}/HTML/en/
+%dir %{_kde4_docdir}/HTML/
+%lang(en) %{_kde4_docdir}/HTML/en/
%changelog
+* Fri Aug 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-6
+- restore kde3 dirs
+
* Thu Aug 09 2007 Than Ngo <than at redhat.com> - 3.92-5
- use macros
More information about the fedora-extras-commits
mailing list