rpms/xdelta/devel xdelta.spec,1.31,1.32

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/xdelta/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28637

Modified Files:
	xdelta.spec 
Log Message:
- merge review related fixes (#226552)



Index: xdelta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdelta/devel/xdelta.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- xdelta.spec	11 Aug 2009 12:58:17 -0000	1.31
+++ xdelta.spec	30 Nov 2009 15:34:41 -0000	1.32
@@ -1,7 +1,7 @@
-Summary: A binary file delta generator and an RCS replacement library.
+Summary: A binary file delta generator and an RCS replacement library
 Name: xdelta
 Version: 1.1.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Group: Development/Tools
 Source0: http://xdelta.googlecode.com/files/xdelta-%{version}.tar.gz
@@ -21,15 +21,15 @@ work independently of the actual format 
 intended to be used by various higher-level programs such as XCF's
 Project Revision Control System (PRCS).  PRCS is a front end for a
 version control toolset.  Xdelta uses a binary file delta algorithm to
-replace the standard diff program used by RCS.
+replace the standard diff program used by RCS
 
 %package devel
-Summary: Static library and header files for Xdelta development.
+Summary: Shared library and header files for Xdelta development
 Group: Development/Libraries
 Requires:  %{name} = %{version}
 %description devel
-The Xdelta-devel package contains the static library and header files
-needed for developing Xdelta-based applications.
+The Xdelta-devel package contains the shared library and header files
+needed for developing Xdelta-based applications
 
 %prep
 %setup -q
@@ -38,9 +38,15 @@ needed for developing Xdelta-based appli
 %patch4 -p1 -b .glib2
 %patch6 -p1 -b .pkgconfig
 
+for all in `find . -type f -perm -001 | grep '.*[ch]$'`; do
+    chmod -x "$all"
+done
+
+chmod -x NEWS README COPYING
+
 %build
 autoreconf -fiv
-%configure
+%configure --disable-static
 
 # IDIOT author overrides our cflags with -O3
 make %{?_smp_mflags} CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS `pkg-config --cflags glib-2.0`" LDFLAGS="`pkg-config --libs glib-2.0`"
@@ -59,22 +65,24 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%doc NEWS README xdelta.magic
+%defattr(-,root,root,-)
+%doc NEWS README xdelta.magic COPYING
 %{_bindir}/xdelta
 %{_libdir}/lib*.so.*
 %{_mandir}/*/*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/xdelta-config
 %{_includedir}/*
-%{_libdir}/lib*.a
 %{_libdir}/lib*.so
 %{_datadir}/aclocal/xdelta.m4
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Nov 30 2009 Adam Tkac <atkac redhat com> 1.1.4-8
+- merge review related fixes (#226552)
+
 * Tue Aug 11 2009 Adam Tkac <atkac redhat com> 1.1.4-7
 - update source + project URLs
 
@@ -229,9 +237,9 @@ rm -rf $RPM_BUILD_ROOT
 
 * Sat Jul 04 1998 Arne Coucheron <arneco at online.no>
   [0.21-1]
-- added xdelta.magic to %doc
+- added xdelta.magic to %%doc
 - added running of automake before configure to make this version build
-- changed %defattr
+- changed %%defattr
 
 * Sat Jun 27 1998 Arne Coucheron <arneco at online.no>
   [0.20-1]
@@ -241,12 +249,12 @@ rm -rf $RPM_BUILD_ROOT
 - fixed configuring sources by add --x-includes=/usr/lib/glib/include
   configure parameter (for glibconfig.h),
 - changed Source url to ftp://www.xcf.berkeley.edu/pub/xdelta/
-- fixed %defattr macros (thanks to René Wuttke <Rene.Wuttke at gmx.net>).
+- fixed %%defattr macros (thanks to René Wuttke <Rene.Wuttke at gmx.net>).
 
 * Wed May  6 1998 Tomasz K³oczko <kloczek at rudy.mif.pg.gda.pl>
   [0.19-2]
 - %%{version} macro instead %%{PACKAGE_VERSION},
-- added -q %setup parameter,
+- added -q %%setup parameter,
 - added using %%{name} macro in Buildroot, Source and Rquires in devel
   fields.
 
@@ -256,11 +264,11 @@ rm -rf $RPM_BUILD_ROOT
 
 * Wed Apr 28 1998 Tomasz K³oczko <kloczek at rudy.mif.pg.gda.pl>
   [0.18-2]
-- removed COPYING from %doc (copyright statment is in Copyright field),
-- /sbin/ldconfig is now -p parameter in %post, %postun,
+- removed COPYING from %%doc (copyright statment is in Copyright field),
+- /sbin/ldconfig is now -p parameter in %%post, %%postun,
 - replaced "mkdir -p" with "install -d" in %%install,
 - added "Requires: xdelta = %%{PACKAGE_VERSION}" for devel,
-- added using %defattr macro in %files (requires rpm >= 2.4.99),
+- added using %%defattr macro in %%files (requires rpm >= 2.4.99),
 - added using predefined macro %%{PACKAGE_VERSION} instead %{version},
 - changed permission on /usr/lib/lib*.so links to 644,
 - removed /usr/lib/libxdelta.la from devel,