Author: wolf                         Date: Thu May 25 15:25:14 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- filesystem with common directories

---- Files affected:
SPECS:
   filesystem.spec (1.51 -> 1.52)  (NEW), FHS.spec (1.113 -> 1.114) 

---- Diffs:

================================================================
Index: SPECS/filesystem.spec
diff -u /dev/null SPECS/filesystem.spec:1.52
--- /dev/null   Thu May 25 17:25:14 2006
+++ SPECS/filesystem.spec       Thu May 25 17:25:08 2006
@@ -0,0 +1,65 @@
+# $Revision$, $Date$
+Summary:       Common directories
+Summary(pl):   Wspólne katalogi
+Name:          filesystem
+Version:       3.0
+Release:       1
+License:       GPL
+Group:         Base
+URL:           http://www.pathname.com/fhs/
+Requires:      FHS >= 2.3-14.2
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+This package contains common directories for packages that extend
+some programs functionality, but don't require them themselves.
+
+%description -l pl
+Ten pakiet zawiera wspólne katalogi dla pakietów rozszerzających
+funkcjonalność programów, ale nie wymagających ich.
+
+%prep
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT/etc/{sysconfig,xdg} \
+       
$RPM_BUILD_ROOT/usr/share/{sounds,pixmaps,icons,wm-properties,xsessions,wallpapers,themes/Default}
+
+
+%clean
+cd $RPM_BUILD_ROOT
+
+# %{_rpmfilename} is not expanded, so use
+# %{name}-%{version}-%{release}.%{buildarch}.rpm
+RPMFILE=%{name}-%{version}-%{release}.%{_target_cpu}.rpm
+TMPFILE=%{name}-%{version}.tmp$$
+find . | sed -e 's|^\.||g' -e 's|^$||g' | sort | grep -v $TMPFILE > $TMPFILE
+
+# find finds also '.', so use option -B for diff
+rpm -qpl %{_rpmdir}/$RPMFILE | grep -v '^/$' | sort | diff -uB $TMPFILE - || :
+
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%dir /etc/sysconfig
+%dir /etc/xdg
+%dir /usr/share/icons
+%dir /usr/share/pixmaps
+%dir /usr/share/sounds
+%dir /usr/share/themes
+%dir /usr/share/themes/Default
+%dir /usr/share/wallpapers
+%dir /usr/share/wm-properties
+%dir /usr/share/xsessions
+
+%define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* %{date} PLD Team <[EMAIL PROTECTED]>
+All persons listed below can be reached at <cvs_login>@pld-linux.org
+
+$Log$
+Revision 1.52  2006/05/25 15:25:08  wolf
+- filesystem with common directories
+

================================================================
Index: SPECS/FHS.spec
diff -u SPECS/FHS.spec:1.113 SPECS/FHS.spec:1.114
--- SPECS/FHS.spec:1.113        Fri May 12 20:25:27 2006
+++ SPECS/FHS.spec      Thu May 25 17:25:08 2006
@@ -6,14 +6,12 @@
 Summary(tr):   Temel dosya sistemi yapýsý
 Name:          FHS
 Version:       2.3
-Release:       14.1
+Release:       14.2
 License:       GPL
 Group:         Base
 URL:           http://www.pathname.com/fhs/
 BuildRequires: rpmbuild(macros) >= 1.213
 Requires:      setup >= 2.4.6-4
-Provides:      filesystem
-Obsoletes:     filesystem
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _locmandir      /usr/local/man
@@ -56,7 +54,7 @@
        $RPM_BUILD_ROOT{/lib/{firmware,modules},/%{_lib}/security} \
        $RPM_BUILD_ROOT/{mnt,media/{cdrom,floppy},proc,root,sbin,tmp} \
        
$RPM_BUILD_ROOT%{_prefix}/{bin,games,include/security,lib/cgi-bin,sbin,share,src/examples}
 \
-       
$RPM_BUILD_ROOT%{_datadir}/{applications,dict,doc,games,icons,info,misc,pixmaps,tmac}
 \
+       $RPM_BUILD_ROOT%{_datadir}/{applications,dict,doc,games,info,misc,tmac} 
\
        $RPM_BUILD_ROOT%{_libdir}/games \
        
$RPM_BUILD_ROOT%{_prefix}/local/{bin,etc,games,include,lib,sbin,share/{doc,info},src}
 \
        $RPM_BUILD_ROOT/var/{lock/subsys,log,mail,run,spool} \
@@ -148,7 +146,6 @@
 %{_fontsdir}
 %{_idldir}
 %{_datadir}/games
-%{_datadir}/icons
 %{_datadir}/info
 %dir %{_mandir}
 %dir %{_mandir}/man*
@@ -182,7 +179,6 @@
 %lang(zh_CN) %{_mandir}/zh_CN
 %lang(zh_TW) %{_mandir}/zh_TW
 %{_datadir}/misc
-%{_datadir}/pixmaps
 %{_datadir}/tmac
 %dir %{_prefix}/lib/cgi-bin
 %{_prefix}/src
@@ -228,6 +224,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.114  2006/05/25 15:25:08  wolf
+- filesystem with common directories
+
 Revision 1.113  2006/05/12 18:25:27  pluto
 - back to release 14.1. wjat about other dirs?
   /usr/share/{sounds,themes,java,xsessions,wm-properties,wallpapers}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/FHS.spec?r1=1.113&r2=1.114&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to