SPECS: template-java.spec, jakarta-commons-collections.spec, jakar...

[glen]

Author: glen                         Date: Wed Apr 11 23:18:15 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- need src subdir

---- Files affected:
SPECS:
   template-java.spec (1.13 -> 1.14) , jakarta-commons-collections.spec (1.15 -> 1.16) , jakarta-commons-dbcp.spec (1.17 -> 1.18) , jakarta-commons-pool.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/template-java.spec
diff -u SPECS/template-java.spec:1.13 SPECS/template-java.spec:1.14
--- SPECS/template-java.spec:1.13	Thu Apr 12 01:08:06 2007
+++ SPECS/template-java.spec	Thu Apr 12 01:18:10 2007
@@ -92,7 +92,8 @@
 
 # source code
 install -d $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{version}
-cp -a dist/src/* $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{version}
+# NOTE: for jakarta-tomcat we must keep src subdir (or patch tomcat otherwise)
+cp -a src $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -127,6 +128,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2007/04/11 23:18:10  glen
+- need src subdir
+
 Revision 1.13  2007/04/11 23:08:06  glen
 - -demo and -source packages
 

================================================================
Index: SPECS/jakarta-commons-collections.spec
diff -u SPECS/jakarta-commons-collections.spec:1.15 SPECS/jakarta-commons-collections.spec:1.16
--- SPECS/jakarta-commons-collections.spec:1.15	Thu Apr 12 00:59:23 2007
+++ SPECS/jakarta-commons-collections.spec	Thu Apr 12 01:18:10 2007
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Jakarta Commons Collections - rozszerzenia Java Collections
 Name:		jakarta-commons-collections
 Version:	3.1
-Release:	1.1
+Release:	1.2
 License:	Apache
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/jakarta/commons/collections/source/commons-collections-%{version}-src.tar.gz
@@ -71,7 +71,7 @@
 
 # source code
 install -d $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{version}
-cp -a src/* $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{version}
+cp -a src $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -98,6 +98,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2007/04/11 23:18:10  glen
+- need src subdir
+
 Revision 1.15  2007/04/11 22:59:23  glen
 - unify
 - created -source

================================================================
Index: SPECS/jakarta-commons-dbcp.spec
diff -u SPECS/jakarta-commons-dbcp.spec:1.17 SPECS/jakarta-commons-dbcp.spec:1.18
--- SPECS/jakarta-commons-dbcp.spec:1.17	Thu Apr 12 01:12:00 2007
+++ SPECS/jakarta-commons-dbcp.spec	Thu Apr 12 01:18:10 2007
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Jakarta Commons DBCP - zarządzanie połączeniem z bazą danych
 Name:		jakarta-commons-dbcp
 Version:	1.2.1
-Release:	1.1
+Release:	1.2
 License:	Apache
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/jakarta/commons/dbcp/source/commons-dbcp-%{version}-src.tar.gz
@@ -90,7 +90,7 @@
 
 # source code
 install -d $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{version}
-cp -a src/* $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{version}
+cp -a src $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -123,6 +123,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2007/04/11 23:18:10  glen
+- need src subdir
+
 Revision 1.17  2007/04/11 23:12:00  glen
 - added -source
 

================================================================
Index: SPECS/jakarta-commons-pool.spec
diff -u SPECS/jakarta-commons-pool.spec:1.20 SPECS/jakarta-commons-pool.spec:1.21
--- SPECS/jakarta-commons-pool.spec:1.20	Thu Apr 12 01:06:56 2007
+++ SPECS/jakarta-commons-pool.spec	Thu Apr 12 01:18:10 2007
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Jakarta Commons Pool - interfejsy gospodarujące obiektami
 Name:		jakarta-commons-pool
 Version:	1.3
-Release:	1.1
+Release:	1.2
 License:	Apache
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/jakarta/commons/pool/source/commons-pool-%{version}-src.tar.gz
@@ -71,7 +71,7 @@
 
 # source code
 install -d $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{version}
-cp -a src/* $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{version}
+cp -a src $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,6 +99,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2007/04/11 23:18:10  glen
+- need src subdir
+
 Revision 1.20  2007/04/11 23:06:56  glen
 - create -source
 - unify again
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/template-java.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/jakarta-commons-collections.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/jakarta-commons-dbcp.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/jakarta-commons-pool.spec?r1=1.20&r2=1.21&f=u