SPECS: apache1-mod_ssl.spec - unpack sources in %prep, cosmetics

[glen]

Author: glen                         Date: Thu Sep 22 10:44:05 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unpack sources in %prep, cosmetics

---- Files affected:
SPECS:
   apache1-mod_ssl.spec (1.104 -> 1.105) 

---- Diffs:

================================================================
Index: SPECS/apache1-mod_ssl.spec
diff -u SPECS/apache1-mod_ssl.spec:1.104 SPECS/apache1-mod_ssl.spec:1.105
--- SPECS/apache1-mod_ssl.spec:1.104	Thu Sep 22 10:41:54 2005
+++ SPECS/apache1-mod_ssl.spec	Thu Sep 22 12:44:00 2005
@@ -183,6 +183,9 @@
 
 %{__perl} -pi -e 's@ /lib /usr/lib @ /%{_lib} /usr/%{_lib} @' pkg.sslmod/libssl.module
 
+cd pkg.contrib
+tar xvf sxnet.tar
+
 %build
 SSL_BASE=SYSTEM; export SSL_BASE
 %configure \
@@ -192,9 +195,7 @@
 
 %{__make}
 
-cd pkg.contrib
-tar xvf sxnet.tar
-cd sxnet
+cd pkg.contrib/sxnet
 %{apxs} -DMalloc=malloc -DFree=free -I%{_includedir}/openssl -L%{_libdir} -l ssl -l crypto -c mod_sxnet.c
 
 %install
@@ -301,12 +302,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.105  2005/09/22 10:44:00  glen
+- unpack sources in %prep, cosmetics
+
 Revision 1.104  2005/09/22 08:41:54  qboosh
 - added CAN note to previous changelog entry
 
 Revision 1.103  2005/09/21 16:51:01  glen
 - 2.8.24
-[fixes CAN-2005-2700]
+  [fixes CAN-2005-2700]
 
 Revision 1.102  2005/09/17 01:23:44  glen
 - correction for detecting conf.d apache support
@@ -464,7 +468,7 @@
 
 Revision 1.53  2002/06/19 18:21:41  qboosh
 - updated to 2.8.9-1.3.26
-- new %%doc
+- new %doc
 
 Revision 1.52  2002/06/19 10:38:32  qboosh
 - allow build with apache 1.3.26 (seems to work), release 2
@@ -473,7 +477,7 @@
 - updated to 2.8.8-1.3.24 (merge DEVEL branch).
 
 Revision 1.50  2002/04/25 15:46:52  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.49  2002/03/05 19:58:50  qboosh
 - fixed undefined symbols (Malloc,Free) in mod_sxnet
@@ -494,9 +498,9 @@
 - release 3
 
 Revision 1.44  2002/02/17 19:01:43  ankry
-- added %%{apxs} local macro to avoid adapter problems
-- fix use of %%{apxs} and %%{_sbindir}/apxs
-- added BR %%{apxs} and Prereq %%{_sbindir}/apxs (if necessary); removed BR apache
+- added %{apxs} local macro to avoid adapter problems
+- fix use of %{apxs} and %{_sbindir}/apxs
+- added BR %{apxs} and Prereq %{_sbindir}/apxs (if necessary); removed BR apache
 
 Revision 1.43  2002/02/17 05:03:01  kloczek
 - release 2.
@@ -512,7 +516,7 @@
 - updated to 2.8.6-1.3.23: merge DEVEL branch to HEAD.
 
 Revision 1.39  2002/01/18 02:12:21  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.38  2001/11/26 17:06:13  blues
 - typo
@@ -540,20 +544,20 @@
 
 Revision 1.30  2001/04/13 16:27:56  qboosh
 - logrotate ssl_{engine,request}_log
-- moved /home/httpd/html/docs/ssl-doc to %%doc
-- changed %%postun to %%preun and fixed - don't disable mod_ssl on upgrade
+- moved /home/httpd/html/docs/ssl-doc to %doc
+- changed %postun to %preun and fixed - don't disable mod_ssl on upgrade
 - release 4
 
 Revision 1.29  2001/03/14 20:09:47  kloczek
 - release 3.
 
 Revision 1.28  2001/03/14 17:41:08  qboosh
-- missing dir: %%{_libdir}/mod_ssl
+- missing dir: %{_libdir}/mod_ssl
 
 Revision 1.27  2001/03/08 08:26:50  kloczek
 - release 2,
 - require in mod_sxnet apache(EAPI) not apache,
-- "apache(EAPI) = %%{APACHEVER}" changed to "apache(EAPI) >= %%{APACHEVER}".
+- "apache(EAPI) = %{APACHEVER}" changed to "apache(EAPI) >= %{APACHEVER}".
 
 Revision 1.26  2001/01/30 23:57:03  areq
 - mod_ssl-2.8.0_1.3.17 NYF
@@ -570,7 +574,7 @@
 - s#apache-devel(EAPI)#apache(EAPI)-devel#
 
 Revision 1.22  2000/11/24 18:09:37  kloczek
-- added "BuildRequires: apache-devel(EAPI) = %%{APACHEVER}".
+- added "BuildRequires: apache-devel(EAPI) = %{APACHEVER}".
 
 Revision 1.21  2000/11/13 16:46:44  baggins
 - updated to 2.7.1-1.3.14
@@ -586,7 +590,7 @@
 - updated mod_ssl to 2.6.6
 
 Revision 1.17  2000/06/09 07:54:39  kloczek
-- more %%{__make} macros.
+- more %{__make} macros.
 
 Revision 1.16  2000/05/17 21:01:20  kloczek
 - spec adapterized.
@@ -595,7 +599,7 @@
 - removed duplicated entry for ssl-doc
 
 Revision 1.14  2000/05/01 19:19:34  bonkey
-- added "/etc/httpd" to "Include mod_ssl.conf" in %%post
+- added "/etc/httpd" to "Include mod_ssl.conf" in %post
 
 Revision 1.13  2000/05/01 18:39:12  bonkey
 - update to 2.6.4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache1-mod_ssl.spec?r1=1.104&r2=1.105&f=u