rpms/moblin-icon-theme/devel .cvsignore, 1.8, 1.9 moblin-icon-theme.spec, 1.11, 1.12 sources, 1.9, 1.10

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-icon-theme/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26323

Modified Files:
	.cvsignore moblin-icon-theme.spec sources 
Log Message:
- New upstream 2.2.1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	6 Jan 2010 18:32:50 -0000	1.8
+++ .cvsignore	12 Feb 2010 03:56:56 -0000	1.9
@@ -1 +1 @@
-moblin-icon-theme-2.2.0.tar.bz2
+moblin-icon-theme-2.2.1.tar.bz2


Index: moblin-icon-theme.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/devel/moblin-icon-theme.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- moblin-icon-theme.spec	11 Feb 2010 14:08:49 -0000	1.11
+++ moblin-icon-theme.spec	12 Feb 2010 03:56:56 -0000	1.12
@@ -1,6 +1,6 @@
 Name:          moblin-icon-theme
-Version:       2.2.0
-Release:       2%{?dist}
+Version:       2.2.1
+Release:       1%{?dist}
 Summary:       Moblin icon theme
 
 Group:         User Interface/Desktops
@@ -20,25 +20,16 @@ Moblin icon theme
 %setup -q
 
 %build
+%configure
+make %{?_smp_mflags} V=1
 
 %install
 rm -rf %{buildroot}
 
-./create-icon-theme.sh moblin
-mkdir -p %{buildroot}/%{_datadir}/icons/Moblin
-cp -p output/moblin/index.theme %{buildroot}/%{_datadir}/icons/Moblin
-cp -rp output/moblin/24x24 %{buildroot}/%{_datadir}/icons/Moblin
-cp -rp output/moblin/32x32 %{buildroot}/%{_datadir}/icons/Moblin
-cp -rp output/moblin/48x48 %{buildroot}/%{_datadir}/icons/Moblin
-
-# create an empty cache file so its removed when the package is
-touch %{buildroot}/%{_datadir}/icons/Moblin/icon-theme.cache
-
-#Remove Makefile.am files
-find %{buildroot} -name 'Makefile.am' -exec rm -f {} ';'
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 # create symlinks for missing stock icons
-cd %{buildroot}/%{_datadir}/icons/Moblin
+cd %{buildroot}/%{_datadir}/icons/moblin
 for size in 24x24 32x32 48x48; do
   (
   cd $size
@@ -54,7 +45,7 @@ for size in 24x24 32x32 48x48; do
 done
 
 # Name the theme correctly
-sed -i 's|moblin|Moblin|g' %{buildroot}/%{_datadir}/icons/Moblin/index.theme
+#sed -i 's|moblin|Moblin|g' %{buildroot}/%{_datadir}/icons/Moblin/index.theme
 
 %clean
 rm -rf %{buildroot}
@@ -76,11 +67,11 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_datadir}/icons/Moblin
+%{_datadir}/icons/moblin
 
 %changelog
-* Thu Feb 11 2010 Peter Robinson <pbrobinson at gmail.com> 2.2.0-2
-- New release
+* Fri Feb 12 2010 Peter Robinson <pbrobinson at gmail.com> 2.2.1-1
+- New upstream 2.2.1 release
 
 * Wed Jan  6 2010 Peter Robinson <pbrobinson at gmail.com> 2.2.0-1
 - New upstream 2.2.0 release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-icon-theme/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	11 Feb 2010 14:08:49 -0000	1.9
+++ sources	12 Feb 2010 03:56:56 -0000	1.10
@@ -1 +1 @@
-4728e91f9d46ee8215678f6975666f09  moblin-icon-theme-2.2.0.tar.bz2
+0ee5e4862379058773b14f360b8ba7e9  moblin-icon-theme-2.2.1.tar.bz2