Fix installation path for erlang-rpm-macros

3 files changed, 29 insertions, 14 deletions

diff --git a/erlang-find-provides.sh b/erlang-find-provides.sh
index 0592130..10cf41e 100755
--- a/erlang-find-provides.sh
+++ b/erlang-find-provides.sh
@@ -63,7 +63,7 @@ for f in $appfiles; do
 	echo "erlang($app) = $ver"
 done
 
-# Check for very special case - erts, by guessing by directory name
+# Check for two special cases by inspecting path to ebin directory
 basedirs=$(echo $filelist | tr [:blank:] '\n' | grep -o -E 'erlang\/lib\/[a-zA-Z_0-9]*-[0-9.]*\/ebin' | cut -d \/ -f 3 | sort | uniq)
 for bd in $basedirs; do
 	basename=`echo $bd | cut -d \- -f 1`
@@ -84,6 +84,7 @@ for bd in $basedirs; do
 			grep "bif " $BUILDDIR/erts/emulator/hipe/*.tab | awk -F "bif " '{print "erlang(" $2 ")"}'
 			;;
 		"wx")
+			# wx module doesn't contain app-file.
 			echo "erlang($basename) = $basever"
 			;;
 		*)
diff --git a/erlang.spec b/erlang.spec
index c622ce4..dc4e6d2 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -5,7 +5,7 @@
 
 Name:           erlang
 Version:        %{ver}
-Release:        %{rel}.5%{?dist}
+Release:        %{rel}.6%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
@@ -81,6 +81,7 @@ Requires: erlang-percept = %{version}-%{release}
 Requires: erlang-pman = %{version}-%{release}
 Requires: erlang-public_key = %{version}-%{release}
 Requires: erlang-reltool = %{version}-%{release}
+Requires: erlang-rpm-macros = %{version}-%{release}
 Requires: erlang-runtime_tools = %{version}-%{release}
 Requires: erlang-sasl = %{version}-%{release}
 Requires: erlang-snmp = %{version}-%{release}
@@ -493,6 +494,14 @@ dependencies and enables interactive customization of a
 target system. The backend provides a batch interface
 for generation of customized target systems.
 
+%package rpm-macros
+Summary:	Necessary macros for building Erlang
+Group:		Development/Languages
+Obsoletes:	%{name} < R13B-04.5
+
+%description rpm-macros
+Necessary macros for building Erlang.
+
 %package runtime_tools
 Summary:	A set of tools to include in a production system
 Group:		Development/Languages
@@ -666,7 +675,6 @@ chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist/c_src/
 chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/kernel-*/examples/uds_dist/src/Makefile
 chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/certs/Makefile
 chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/examples/src/Makefile
-chmod 644 $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/priv/obj/Makefile
 
 # install additional doc files
 mkdir -p erlang_doc
@@ -726,10 +734,10 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/odbc-*/priv/obj
 rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/ssl-*/priv/obj
 
 # Install RPM related files
-install -D -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-provides.escript
-install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-provides.sh
-install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-requires.escript
-install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/rpm/erlang-find-requires.sh
+install -D -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-provides.escript
+install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-provides.sh
+install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-requires.escript
+install -D -p -m 0755 %{SOURCE6} $RPM_BUILD_ROOT%{_rpmconfigdir}/erlang-find-requires.sh
 install -D -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.erlang
 
 
@@ -745,13 +753,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_libdir}/erlang/README
 %doc %{_libdir}/erlang/COPYRIGHT
 
-# RPM stuff
-%{_sysconfdir}/rpm/macros.erlang
-%{_libdir}/rpm/erlang-find-provides.escript
-%{_libdir}/rpm/erlang-find-provides.sh
-%{_libdir}/rpm/erlang-find-requires.escript
-%{_libdir}/rpm/erlang-find-requires.sh
-
 %files appmon
 %defattr(-,root,root)
 %{_libdir}/erlang/lib/appmon-*/
@@ -982,6 +983,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/erlang/lib/reltool-*/ebin
 %{_libdir}/erlang/lib/reltool-*/src
 
+%files rpm-macros
+%defattr(-,root,root)
+%{_sysconfdir}/rpm/macros.erlang
+%{_rpmconfigdir}/erlang-find-provides.escript
+%{_rpmconfigdir}/erlang-find-provides.sh
+%{_rpmconfigdir}/erlang-find-requires.escript
+%{_rpmconfigdir}/erlang-find-requires.sh
+
 %files runtime_tools
 %defattr(-,root,root)
 %{_libdir}/erlang/lib/runtime_tools-*/
@@ -1071,6 +1080,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 26 2010 Peter Lemenkov <lemenkov@gmail.com> - R13B-04.6
+- Made erlang-rpm-macros as separate package
+- Fix error while installing erlang-rpm-macros
+
 * Wed Apr 17 2010 Peter Lemenkov <lemenkov@gmail.com> - R13B-04.5
 - Use erlang rpm macros for adding provides/reqires
 - All %%{_libdir}/erlang/lib/* items were splitted off from main package, which
diff --git a/import.log b/import.log
index 1c80656..97016fb 100644
--- a/import.log
+++ b/import.log
@@ -3,3 +3,4 @@ erlang-R13B-04_2_fc12:F-12:erlang-R13B-04.2.fc12.src.rpm:1269609314
 erlang-R13B-04_3_fc12:F-12:erlang-R13B-04.3.fc12.src.rpm:1271239367
 erlang-R13B-04_4_fc12:F-12:erlang-R13B-04.4.fc12.src.rpm:1271523892
 erlang-R13B-04_5_fc12:F-12:erlang-R13B-04.5.fc12.src.rpm:1272271343
+erlang-R13B-04_6_fc12:F-12:erlang-R13B-04.6.fc12.src.rpm:1272303739