rpms/jakarta-commons-configuration/devel jakarta-commons-configuration.spec, 1.1, 1.2

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/jakarta-commons-configuration/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20041/devel

Modified Files:
	jakarta-commons-configuration.spec 
Log Message:
* Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.4-7
- Fix description.
- Remove requires(post/postun) for javadoc subpackage.
- Use sed instead of dos2unix.


Index: jakarta-commons-configuration.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-configuration/devel/jakarta-commons-configuration.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jakarta-commons-configuration.spec	20 Aug 2009 04:42:19 -0000	1.1
+++ jakarta-commons-configuration.spec	20 Aug 2009 18:18:47 -0000	1.2
@@ -32,7 +32,7 @@
 
 Name:           jakarta-commons-configuration
 Version:        1.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          0
 Summary:        Commons Configuration Package
 
@@ -67,7 +67,6 @@ BuildRequires:  jakarta-commons-pool
 BuildRequires:  servletapi5
 BuildRequires:  xerces-j2
 BuildRequires:  xml-commons-apis
-BuildRequires:  dos2unix
 
 Requires:  jakarta-commons-beanutils >= 0:1.7.0
 Requires:  jakarta-commons-codec
@@ -92,7 +91,7 @@ provides easy typed access to single, as
 configuration values based on a 'key'.
 Right now you can load properties from a simple properties
 file, a properties file in a jar, an XML file, JNDI settings,
-as well as use a mix different sources using a
+as well as use a mix of different sources using a
 ConfigurationFactory and CompositeConfiguration.
 Custom configuration objects are very easy to create now
 by just subclassing AbstractConfiguration. This works
@@ -101,8 +100,6 @@ similar to how AbstractList works.
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
-Requires(post):   /bin/rm,/bin/ln
-Requires(postun): /bin/rm
 
 %description    javadoc
 Javadoc for %{name}
@@ -111,7 +108,7 @@ Javadoc for %{name}
 %prep
 %setup -q -n %{base_name}-%{version}-src
 %patch0 -b .sav
-dos2unix LICENSE.txt
+%{__sed} -i 's/\r//' LICENSE.txt
 
 %build
 export CLASSPATH=$(build-classpath \
@@ -169,6 +166,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.4-7
+- Fix description.
+- Remove requires(post/postun) for javadoc subpackage.
+- Use sed instead of dos2unix.
+
 * Thu Aug 20 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.4-6
 - Remove gcj support.
 - Initial build for Fedora.