rpms/kxdocker-resources/devel .cvsignore, 1.2, 1.3 kxdocker-resources.spec, 1.2, 1.3 sources, 1.2, 1.3

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/kxdocker-resources/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15778

Modified Files:
	.cvsignore kxdocker-resources.spec sources 
Log Message:
* Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.0-1
- 1.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kxdocker-resources/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Nov 2005 17:40:39 -0000	1.2
+++ .cvsignore	12 Jun 2006 15:56:38 -0000	1.3
@@ -1 +1,2 @@
 kxdocker-resources-0.14.tar.bz2
+kxdocker-resources-1.1.0.tar.bz2


Index: kxdocker-resources.spec
===================================================================
RCS file: /cvs/extras/rpms/kxdocker-resources/devel/kxdocker-resources.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kxdocker-resources.spec	2 Nov 2005 16:15:00 -0000	1.2
+++ kxdocker-resources.spec	12 Jun 2006 15:56:38 -0000	1.3
@@ -1,17 +1,19 @@
 
 Name:    kxdocker-resources
 Summary: Plugins, Sounds, and Themes for kxdocker 
-Version: 0.14
-Release: 3%{?dist}
+Version: 1.1.0 
+Release: 1
 
 License: GPL
 Group:   User Interface/Desktops
 Url:	 http://www.xiaprojects.com/www/prodotti/kxdocker/
-Source:  http://www.xiaprojects.com/www/downloads/files/kxdocker/kxdocker-resources-%{version}.tar.bz2
+Source:  http://www.xiaprojects.com/www/downloads/files/kxdocker/1.0.0/kxdocker-resources-1.1.0.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-Requires: kxdocker
+Patch1: kxdocker-resources-1.1.0-tar.patch
+
+Requires: kxdocker >= 1.0
 
 # just need kde-config
 BuildRequires: kdelibs-devel
@@ -23,6 +25,8 @@
 %prep
 %setup -q 
 
+%patch1 -p1 -b .tar
+
 
 %build
 ./configure
@@ -34,25 +38,36 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # remove crud
-find $RPM_BUILD_ROOT -type d -depth -name '.xv*' -exec rm -vrf {} \; 
-find $RPM_BUILD_ROOT -type f -name '.DS*' -o -name '*copia.png' | xargs rm -vf
+#find $RPM_BUILD_ROOT -type d -depth -name '.xv*' -exec rm -vrf {} \; 
+#find $RPM_BUILD_ROOT -type f -name '.DS*' -o -name '*copia.png' | xargs rm -vf
 
 # fixup permissions
-find $RPM_BUILD_ROOT -type f -name '*.png' -exec chmod 0644 {} \; 
-
+#find $RPM_BUILD_ROOT -type f -name '*.png' -exec chmod 0644 {} \; 
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT 
 
 
+%pre
+# Handle case of replacing (former) dir with symlink
+if [ $1 -gt 1 ]; then
+if [ -d %{_datadir}/apps/kxdocker/themes/pillow ]; then 
+%{__rm} -rf %{_datadir}/apps/kxdocker/themes/pillow ||:
+fi
+fi
+
+
 %files 
 %defattr(-,root,root,-)
 %doc readme.txt 
-%{_datadir}/apps/kxdocker
+%{_datadir}/apps/kxdocker/
 
 
 %changelog
+* Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.0-1
+- 1.1.0
+
 * Tue Nov 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.14-3
 - prune more junk
 - *really* fix permissions


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kxdocker-resources/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Nov 2005 17:40:39 -0000	1.2
+++ sources	12 Jun 2006 15:56:38 -0000	1.3
@@ -1 +1,2 @@
 5b0ae04969caad180a192e465a1efd0f  kxdocker-resources-0.14.tar.bz2
+1b1b3c2ff5fd0ddd4426e9011d125dee  kxdocker-resources-1.1.0.tar.bz2