rpms/gnustep-make/devel gnustep-make-1.12.0-chickenandegg.patch, NONE, 1.1 gnustep-make-1.12.0-fhs_which_lib.patch, NONE, 1.1 gnustep-make.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Axel Thimm (athimm)
fedora-extras-commits at redhat.com
Fri Sep 1 22:49:28 UTC 2006
Author: athimm
Update of /cvs/extras/rpms/gnustep-make/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18210/devel
Modified Files:
.cvsignore sources
Added Files:
gnustep-make-1.12.0-chickenandegg.patch
gnustep-make-1.12.0-fhs_which_lib.patch gnustep-make.spec
Log Message:
auto-import gnustep-make-1.12.0-5.at on branch devel from gnustep-make-1.12.0-5.at.src.rpm
gnustep-make-1.12.0-chickenandegg.patch:
--- NEW FILE gnustep-make-1.12.0-chickenandegg.patch ---
--- gnustep-make-1.12.0/common.make~ 2006-02-22 07:43:07.000000000 +0100
+++ gnustep-make-1.12.0/common.make 2006-07-11 18:17:22.000000000 +0200
@@ -27,6 +27,23 @@
SHELL = /bin/sh
#
+# Determine the compilation host and target
+#
+include $(GNUSTEP_MAKEFILES)/names.make
+
+ifeq ($(GNUSTEP_FLATTENED),)
+ GNUSTEP_HOST_DIR = $(GNUSTEP_HOST_CPU)/$(GNUSTEP_HOST_OS)
+ GNUSTEP_TARGET_DIR = $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
+ GNUSTEP_HOST_LDIR = $(GNUSTEP_HOST_DIR)/$(LIBRARY_COMBO)
+ GNUSTEP_TARGET_LDIR = $(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
+else
+ GNUSTEP_HOST_DIR = .
+ GNUSTEP_TARGET_DIR = .
+ GNUSTEP_HOST_LDIR = .
+ GNUSTEP_TARGET_LDIR = .
+endif
+
+#
# Get the config information first, this includes GNUSTEP_SYSTEM_ROOT etc.
#
include $(GNUSTEP_MAKEFILES)/$(GNUSTEP_TARGET_DIR)/config.make
@@ -62,28 +79,6 @@
TRANSFORM_PATHS_SCRIPT = $(GNUSTEP_MAKEFILES)/transform_paths.sh
REL_PATH_SCRIPT = $(GNUSTEP_MAKEFILES)/relative_path.sh
-# Take the makefiles from the system root
-ifeq ($(GNUSTEP_MAKEFILES),)
- GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Library/Makefiles
-endif
-
-#
-# Determine the compilation host and target
-#
-include $(GNUSTEP_MAKEFILES)/names.make
-
-ifeq ($(GNUSTEP_FLATTENED),)
- GNUSTEP_HOST_DIR = $(GNUSTEP_HOST_CPU)/$(GNUSTEP_HOST_OS)
- GNUSTEP_TARGET_DIR = $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
- GNUSTEP_HOST_LDIR = $(GNUSTEP_HOST_DIR)/$(LIBRARY_COMBO)
- GNUSTEP_TARGET_LDIR = $(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
-else
- GNUSTEP_HOST_DIR = .
- GNUSTEP_TARGET_DIR = .
- GNUSTEP_HOST_LDIR = .
- GNUSTEP_TARGET_LDIR = .
-endif
-
#
# Sanity checks - only performed at the first make invocation
#
gnustep-make-1.12.0-fhs_which_lib.patch:
--- NEW FILE gnustep-make-1.12.0-fhs_which_lib.patch ---
--- gnustep-make-1.12.0/GNUmakefile.in~ 2006-07-28 16:43:22.000000000 +0200
+++ gnustep-make-1.12.0/GNUmakefile.in 2006-07-28 16:56:24.000000000 +0200
@@ -148,8 +148,7 @@
$(INSTALL_DATA) GNUstep.conf "$(GNUSTEP_CONFIG_FILE)")
-$(EC) rm -f "$(GNUSTEP_SYSTEM_ROOT)/Makefiles"
$(EC)(echo "Installing gnustep-make support software"; \
- $(INSTALL_PROGRAM) -m 755 which_lib$(EXEEXT) \
- $(makedir)/$(GNUSTEP_TARGET_DIR))
+ $(INSTALL_PROGRAM) -m 755 which_lib$(EXEEXT) $(tooldir))
$(EC)(for f in config.guess config.sub install-sh mkinstalldirs \
clean_cpu.sh clean_os.sh \
clean_vendor.sh cpu.sh GNUstep-reset.sh \
--- gnustep-make-1.12.0/common.make~ 2006-07-28 16:43:22.000000000 +0200
+++ gnustep-make-1.12.0/common.make 2006-07-28 16:57:23.000000000 +0200
@@ -71,9 +71,9 @@
CLEAN_OS_SCRIPT = $(GNUSTEP_MAKEFILES)/clean_os.sh
ifeq ($(GNUSTEP_FLATTENED),)
WHICH_LIB_SCRIPT \
- = $(GNUSTEP_MAKEFILES)/$(GNUSTEP_HOST_CPU)/$(GNUSTEP_HOST_OS)/which_lib
+ = $(GNUSTEP_SYSTEM_ROOT)/Tools/which_lib
else
- WHICH_LIB_SCRIPT = $(GNUSTEP_MAKEFILES)/which_lib
+ WHICH_LIB_SCRIPT = $(GNUSTEP_SYSTEM_ROOT)/Tools/which_lib
endif
LD_LIB_PATH_SCRIPT = $(GNUSTEP_MAKEFILES)/ld_lib_path.sh
TRANSFORM_PATHS_SCRIPT = $(GNUSTEP_MAKEFILES)/transform_paths.sh
--- NEW FILE gnustep-make.spec ---
Summary: GNUstep makefile package
Name: gnustep-make
Version: 1.12.0
Release: 5%{?dist}
License: GPL
Group: Development/Tools
URL: http://www.gnustep.org/
Source0: ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz
Patch0: gnustep-make-1.12.0-chickenandegg.patch
Patch1: gnustep-make-1.12.0-fhs_which_lib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: texinfo, tetex-latex, tetex-dvips
%description
The makefile package is a simple, powerful and extensible way to write
makefiles for a GNUstep-based project. It allows the user to write a
project without having to deal with the complex issues associated with
configuration, building, installation, and packaging. It also allows
the user to easily create cross-compiled binaries.
%prep
%setup -q
%patch0 -p1
# Fix make install into alternative root
perl -pi -e's,makedir = \@GNUSTEP_MAKEFILES\@,makedir = \$(special_prefix)\@GNUSTEP_MAKEFILES\@,' GNUmakefile.in
# FHS herculian act (more like Sysphus, but anyway ...)
%patch1 -p1
myreplace() {
grep -rl "$1" . | egrep -v '(ChangeLog|INSTALL|\.texi$|README|FAQ)' | xargs -r echo perl -pi -e"s,$1,$2,g" | sh -x
}
myreplace /share /share/gnustep
myreplace Library/Headers include/gnustep
myreplace Library/Applications bin
myreplace Library/Makefiles share/gnustep/makefiles
myreplace /Library /share/gnustep
myreplace Library/ share/gnustep/
myreplace /Tools /libexec/gnustep
myreplace Tools/ libexec/gnustep/
%build
%configure \
--with-system-root=%{_prefix} \
--with-local-root=/usr/local \
--disable-flattened
make
make -C Documentation
%install
rm -rf %{buildroot}
make install special_prefix=%{buildroot}
make -C Documentation install special_prefix=%{buildroot}
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc ANNOUNCE COPYING FAQ NEWS README
%{_datadir}/gnustep
%{_libexecdir}/gnustep
%dir /etc/GNUstep
%config(noreplace) /etc/GNUstep/GNUstep.conf
%changelog
* Fri Jul 28 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.12.0-5
- Try to make FHS compliant.
* Tue Jul 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.12.0-4
- Remove default -lobjc-fd2 switch.
- Disable flat hierarchy to allow for different library combos.
* Wed Jul 5 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.12.0-3
- Update to 1.12.0.
- Use %%{?dist} instead of %%atrelease.
- Use %%{_libdir}/GNUstep as system root.
* Sun Mar 12 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
- Initial build.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnustep-make/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Sep 2006 22:48:16 -0000 1.1
+++ .cvsignore 1 Sep 2006 22:49:28 -0000 1.2
@@ -0,0 +1 @@
+gnustep-make-1.12.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnustep-make/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Sep 2006 22:48:16 -0000 1.1
+++ sources 1 Sep 2006 22:49:28 -0000 1.2
@@ -0,0 +1 @@
+1883a6387405e51ff4c384fb5cc547a7 gnustep-make-1.12.0.tar.gz
More information about the scm-commits
mailing list