- Merge-Review #226066

- make is not verbose
- preserve timestamp of index.theme

libXcursor.spec

@@ -1,7 +1,7 @@
 Summary: Cursor management library 
 Name: libXcursor
 Version: 1.1.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -34,20 +34,20 @@ libXcursor development package.
 
 %prep
 %setup -q
-tr -d '\r' < COPYING > COPYING.new
-iconv -f ISO-8859-2 -t UTF-8 COPYING.new > COPYING
-
+iconv --from=ISO-8859-2 --to=UTF-8 COPYING > COPYING.new && \
+touch -r COPYING COPYING.new && \
+mv COPYING.new COPYING
 
 # Disable static library creation by default.
 %define with_static 0
 
 %build
-#export CFLAGS="$RPM_OPT_FLAGS -DICONDIR=\"/usr/share/icons\""
+#export CFLAGS="$RPM_OPT_FLAGS -DICONDIR=\"%{_datadir}/icons\""
 %configure \
 %if ! %{with_static}
-	--disable-static
+ --disable-static
 %endif
-make %{?_smp_mflags}
+make V=1 %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -55,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/default
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/default/index.theme
+install -m 644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/default/index.theme
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -87,6 +87,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Xcursor*.3*
 
 %changelog
+* Wed Oct 21 2009 Parag <paragn@fedoraproject.org> - 1.1.10-3
+- Merge-Review #226066
+- make is not verbose
+- preserve timestamp of index.theme
+
 * Thu Oct 08 2009 Parag <paragn@fedoraproject.org> - 1.1.10-2
 - Merge-Review #226066
 - Removed XFree86-libs, xorg-x11-libs as Obsoletes