SPECS: opengroupware.spec - compiles (but doesn't build yet) - nee...

[czarny]

Author: czarny                       Date: Wed Sep  7 21:46:32 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- compiles (but doesn't build yet)
- needs a lot of work with files
- changed BR to gnustep-make-libFoundation-devel
- made includes from gnustep-make-libFoundation

---- Files affected:
SPECS:
   opengroupware.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/opengroupware.spec
diff -u SPECS/opengroupware.spec:1.5 SPECS/opengroupware.spec:1.6
--- SPECS/opengroupware.spec:1.5	Wed Sep  7 02:28:23 2005
+++ SPECS/opengroupware.spec	Wed Sep  7 23:46:27 2005
@@ -1,5 +1,8 @@
 # $Revision$, $Date$
 # TODO: spec filename vs Name
+# - make it build oustide GNUstep directory : /usr/lib/
+# - choose ./configure vs . include
+# - make %files according of choice
 %define		ogo_makeflags	-s
 %define		zid_ver		1.3
 %define		xmlrpcd_ver	1.0a
@@ -19,11 +22,11 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	glibc-devel
-BuildRequires:	gnustep-make-devel
-BuildRequires:  opengroupware.org-pilot-link-devel
+BuildRequires:	gnustep-make-libFoundation-devel
+#BuildRequires:  opengroupware.org-pilot-link-devel
 BuildRequires:	openldap-devel
 BuildRequires:	openssl-devel >= 0.9.7
-BuildRequires:	pilot-link-devel
+#BuildRequires:	pilot-link-devel
 BuildRequires:	postgresql-devel
 BuildRequires:	openldap-devel
 BuildRequires:	sope-appserver-devel
@@ -375,10 +378,8 @@
 
 %build
 set -x
-. %{_libdir}/GNUstep/System/Library/Makefiles/GNUstep.sh
-
-./configure --with-gnustep --gsmake=%{_libdir}/GNUstep/System/Library/Makefiles
-
+. %{_libdir}/GNUstep-libFoundation/System/Library/Makefiles/GNUstep.sh
+./configure
 %{__make} %{ogo_makeflags}
 
 %install
@@ -386,23 +387,23 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/GNUstep
 
-. %{_libdir}/GNUstep/System/Library/Makefiles/GNUstep.sh
+. %{_libdir}/GNUstep-libFoundation/System/Library/Makefiles/GNUstep.sh
 
 %{__make} %{ogo_makeflags} install \
-	GNUSTEP_INSTALLATION_DIR=$RPM_BUILD_ROOT%{_libdir}/GNUstep/System \
+	GNUSTEP_INSTALLATION_DIR=$RPM_BUILD_ROOT%{_libdir}/GNUstep-libFoundation/System \
 	FHS_INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} \
 	BUNDLE_INSTALL_DIR=$RPM_BUILD_ROOT%{_prefix} \
 	WOBUNDLE_INSTALL_DIR=$RPM_BUILD_ROOT%{_prefix}
 
-cp -Rp WebUI/Templates "$RPM_BUILD_ROOT%{_datadir}/opengroupware.org-%{version}/templates"
-cp -Rp WebUI/Resources "$RPM_BUILD_ROOT%{_datadir}/opengroupware.org-%{version}/translations"
-cp -Rp Themes/WebServerResources "$RPM_BUILD_ROOT%{_datadir}/opengroupware.org-%{version}/www"
-rm -fr "$RPM_BUILD_ROOT%{_datadir}/opengroupware.org-%{version}/templates/HelpUI"
-rm -fr "$RPM_BUILD_ROOT%{_datadir}/opengroupware.org-%{version}/translations/COPYRIGHT"
-rm -fr "$RPM_BUILD_ROOT%{_datadir}/opengroupware.org-%{version}/translations/ChangeLog"
-rm -fr "$RPM_BUILD_ROOT%{_datadir}/opengroupware.org-%{version}/translations/GNUmakefile"
-rm -fr "$RPM_BUILD_ROOT%{_datadir}/opengroupware.org-%{version}/www/GNUmakefile"
-rm -fr "$RPM_BUILD_ROOT%{_datadir}/opengroupware.org-%{version}/www/tools"
+#cp -Rp WebUI/Templates "$RPM_BUILD_ROOT%{_datadir}/opengroupware.org-%{version}/templates"
+#cp -Rp WebUI/Resources "$RPM_BUILD_ROOT%{_datadir}/opengroupware.org-%{version}/translations"
+#cp -Rp Themes/WebServerResources "$RPM_BUILD_ROOT%{_datadir}/opengroupware.org-%{version}/www"
+#rm -fr "$RPM_BUILD_ROOT%{_datadir}/opengroupware.org-%{version}/templates/HelpUI"
+#rm -fr "$RPM_BUILD_ROOT%{_datadir}/opengroupware.org-%{version}/translations/COPYRIGHT"
+#rm -fr "$RPM_BUILD_ROOT%{_datadir}/opengroupware.org-%{version}/translations/ChangeLog"
+#rm -fr "$RPM_BUILD_ROOT%{_datadir}/opengroupware.org-%{version}/translations/GNUmakefile"
+#rm -fr "$RPM_BUILD_ROOT%{_datadir}/opengroupware.org-%{version}/www/GNUmakefile"
+#rm -fr "$RPM_BUILD_ROOT%{_datadir}/opengroupware.org-%{version}/www/tools"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -778,6 +779,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/09/07 21:46:27  czarny
+- compiles (but doesn't build yet)
+- needs a lot of work with files
+- changed BR to gnustep-make-libFoundation-devel
+- made includes from gnustep-make-libFoundation
+
 Revision 1.5  2005/09/07 00:28:23  wolvverine
 - add BR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/opengroupware.spec?r1=1.5&r2=1.6&f=u