SPECS: openclipart.spec - redo packaging - dirs belong to common (...

[glen]

Author: glen                         Date: Thu Mar  8 02:20:48 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- redo packaging - dirs belong to common (-AUTHORS) package
- pointless clipart dir removed
- rel 3

---- Files affected:
SPECS:
   openclipart.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/openclipart.spec
diff -u SPECS/openclipart.spec:1.12 SPECS/openclipart.spec:1.13
--- SPECS/openclipart.spec:1.12	Sat Feb 17 15:08:40 2007
+++ SPECS/openclipart.spec	Thu Mar  8 03:20:43 2007
@@ -3,15 +3,14 @@
 Summary(pl.UTF-8):	Archiwum klipartów, które można używać w dowolny sposób za darmo
 Name:		openclipart
 Version:	0.18
-Release:	2
+Release:	3
 Epoch:		0
 License:	Creative Commons and/or Public Domain
 Group:		Applications/Graphics
 Source0:	http://www.openclipart.org/downloads/%{version}/%{name}-%{version}-full.tar.bz2
 # Source0-md5:	f13a58a7fcab9d8647ea528d28c4b813
 URL:		http://www.openclipart.org/
-BuildRequires:	findutils
-Requires:       %{name}-AUTHORS = %{epoch}:%{version}-%{release}
+Requires:	%{name}-AUTHORS = %{epoch}:%{version}-%{release}
 Obsoletes:	openclipart-MISC
 Obsoletes:	openclipart-action
 Obsoletes:	openclipart-actions
@@ -78,30 +77,49 @@
 %prep
 %setup -q -n %{name}-%{version}-full
 
-%build
-find . -empty -type d -exec rmdir "{}" ";" || :
-
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT
 
-:> %{name}-txt.txt
-:> %{name}-svg.txt
-:> %{name}-png.txt
-
-for dir in `find . ! -name '.' -type d -print`; do
-	install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/${dir}
-	if (install ${dir}/*.svg $RPM_BUILD_ROOT%{_datadir}/%{name}/${dir}); then
-		echo "%dir %{_datadir}/%{name}/${dir}" >> %{name}-svg.txt
-		echo "%{_datadir}/%{name}/${dir}/*.svg" >> %{name}-svg.txt
-	fi
-	if (install ${dir}/*.png $RPM_BUILD_ROOT%{_datadir}/%{name}/${dir}); then
-		echo "%dir %{_datadir}/%{name}/${dir}" >> %{name}-png.txt
-		echo "%{_datadir}/%{name}/${dir}/*.png" >> %{name}-png.txt
-	fi
-	if (install ${dir}/*.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/${dir}); then
-		echo "%{_datadir}/%{name}/${dir}/*.txt" >> %{name}-txt.txt
-	fi
-done
+install_data() {
+	echo "Using cp -a$l top copy files"
+	for src in "$@"; do
+		dst=${src#clipart/}
+		echo "- $dst"
+		install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/$dst
+		diradd=0
+		if ls $src/*.svg > /dev/null 2>&1; then
+			diradd=1
+			echo " svg: $dst"
+			cp -a$l $src/*.svg $RPM_BUILD_ROOT%{_datadir}/%{name}/$dst
+			echo "%{_datadir}/%{name}/$dst/*.svg" >> %{name}-svg.txt
+		fi
+		if ls $src/*.png > /dev/null 2>&1; then
+			diradd=1
+			echo " png: $dst"
+			cp -a$l $src/*.png $RPM_BUILD_ROOT%{_datadir}/%{name}/$dst
+			echo "%{_datadir}/%{name}/$dst/*.png" >> %{name}-png.txt
+		fi
+		if ls $src/*.txt > /dev/null 2>&1; then
+			diradd=1
+			echo " txt: $dst"
+			cp -a$l $src/*.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/$dst
+			echo "%{_datadir}/%{name}/$dst/*.txt" >> %{name}-txt.txt
+		fi
+		if [ $diradd = 1 ]; then
+			echo "%dir %{_datadir}/%{name}/$dst" >> %{name}-txt.txt
+		fi
+	done
+}
+
+rm -f %{name}-{txt,svg,png}.txt
+
+# test if we can hardlink -- src and dest on the same partition
+if cp -al README $RPM_BUILD_ROOT/README 2>/dev/null; then
+	l=l
+	rm -f $RPM_BUILD_ROOT/README
+fi
+install_data $(find clipart ! -name clipart -type d)
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,20 +132,21 @@
 
 %files AUTHORS -f %{name}-txt.txt
 %defattr(644,root,root,755)
-%doc README ChangeLog
+%doc AUTHORS README ChangeLog NEWS
 %dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/clipart
-%dir %{_datadir}/%{name}/clipart/special
-%dir %{_datadir}/%{name}/clipart/special/examples
-%dir %{_datadir}/%{name}/nsis
-%dir %{_datadir}/%{name}/nsis/Licenses
+%dir %{_datadir}/%{name}/special/examples
 
-%define date    %(echo Mon Nov 01 2004)
+%define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2007/03/08 02:20:43  glen
+- redo packaging - dirs belong to common (-AUTHORS) package
+- pointless clipart dir removed
+- rel 3
+
 Revision 1.12  2007/02/17 14:08:40  megabajt
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openclipart.spec?r1=1.12&r2=1.13&f=u