- move apidocs to -devel; rel 1

[packages/log4cxx.git] / log4cxx.spec

diff --git a/log4cxx.spec b/log4cxx.spec
index 22bdcc504380810a675d844bbf0a7a3eac258ade..b95d44f2943e1d85b461e21ebafdb440d33a6b42 100644 (file)
--- a/log4cxx.spec
+++ b/log4cxx.spec
@@ -2,15 +2,14 @@ Summary:      Log4cxx - a port to C++ of the log4j project
 Summary(pl.UTF-8):     Log4cxx - port projektu log4j dla C++
 Name:          log4cxx
 Version:       0.10.0
-Release:       0.3
-License:       Apache
+Release:       1
+License:       Apache v2.0
 Group:         Libraries
 Source0:       http://www.apache.org/dist/logging/log4cxx/0.10.0/apache-%{name}-%{version}.tar.gz
 # Source0-md5: b30ffb8da3665178e68940ff7a61084c
 Patch0:                %{name}-gcc43.patch
 URL:           http://logging.apache.org/log4cxx/
 BuildRequires: apr-util-devel
-BuildRequires: db4.7-devel
 BuildRequires: libstdc++-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -30,6 +29,8 @@ Summary:      Header files for log4cxx library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki log4cxx
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      apr-util-devel
+Requires:      libstdc++-devel
 
 %description devel
 This is the package containing the header files for log4cxx library.
@@ -51,11 +52,9 @@ Statyczna biblioteka log4cxx.
 
 %prep
 %setup -q -n apache-%{name}-%{version}
-
 %patch0 -p1
 
 %build
-
 %configure
 %{__make}
 
@@ -74,16 +73,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc KEYS LICENSE NOTICE
 %attr(755,root,root) %{_libdir}/liblog4cxx.so.*.*.*
-%attr(755,root,root) %{_libdir}/liblog4cxx.so.*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/html
+%attr(755,root,root) %ghost %{_libdir}/liblog4cxx.so.10
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/liblog4cxx.so
 %{_libdir}/liblog4cxx.la
-%{_pkgconfigdir}/liblog4cxx.pc
 %{_includedir}/%{name}
+%{_pkgconfigdir}/liblog4cxx.pc
+# - apidocs subpkg?
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/html
 
 %files static
 %defattr(644,root,root,755)