diff --git a/.gitignore b/.gitignore index faeed3e..a20d296 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ gnustep-make-2.4.0.tar.gz /gnustep-make-2.6.5.tar.gz /gnustep-make-2.6.6.tar.gz /gnustep-make-2.6.7.tar.gz +/gnustep-make-2.6.8.tar.gz diff --git a/gnustep-make-macros.gnustep b/gnustep-make-macros.gnustep new file mode 100644 index 0000000..b4447ff --- /dev/null +++ b/gnustep-make-macros.gnustep @@ -0,0 +1,50 @@ +%gnustep_libdir %{_libdir}/GNUstep + +%gnustep_appdir %{gnustep_libdir}/Applications +%gnustep_appsupdir %{gnustep_libdir}/ApplicationSupport +%gnustep_bundledir %{gnustep_libdir}/Bundles +%gnustep_cpickdir %{gnustep_libdir}/ColorPickers +%gnustep_srvdir %{gnustep_libdir}/Services + +%gnustep_makefiles %{gnustep_libdir}/Makefiles +%gnustep_additional %{gnustep_libdir}/Makefiles/Additional +%gnustep_libraries %{gnustep_libdir}/Libraries + +%gnustep_docdir %{gnustep_libdir}/Documentation +%gnustep_devdocdic %{gnustep_docdir}/Development +%gnustep_userdocdir %{gnustep_docdir}/User +%gnustep_dtddir %{gnustep_libdir}/DTDs +%gnustep_fontdir %{gnustep_libdir}/Fonts +%gnustep_imagedir %{gnustep_libdir}/Images +%gnustep_kbdir %{gnustep_libdir}/KeyBindings +%gnustep_psdir %{gnustep_libdir}/PostScript +%gnustep_sounddir %{gnustep_libdir}/Sounds + +%gnustep_configure\ +%configure --with-installation-domain=SYSTEM + +%gnustep_make(n) make %{?_smp_mflags} \\\ +%if "X%{-n:Y}" == "X" \ + GNUSTEP_MAKEFILES=%{gnustep_makefiles} \\\ +%endif\ + messages=yes + +%gnustep_makedoc\ +make -C Documentation %{?_smp_mflags} messages=yes \\\ + GNUSTEP_MAKEFILES=%{gnustep_makefiles} + +%gnustep_install(n)\ +make install messages=yes \\\ + DESTDIR=%{buildroot} \\\ +%if "X%{-n:Y}" == "X" \ + GNUSTEP_MAKEFILES=%{gnustep_makefiles} \\\ +%endif \ + GNUSTEP_INSTALLATION_DOMAIN=SYSTEM + +%gnustep_install_without_gnustep_makefiles() %gnustep_install -n + +%gnustep_installdoc\ +make -C Documentation install messages=yes \\\ + DESTDIR=%{buildroot} \\\ + GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \\\ + GNUSTEP_MAKEFILES=%{gnustep_makefiles} diff --git a/gnustep-make.spec b/gnustep-make.spec index 9790aad..270aecd 100644 --- a/gnustep-make.spec +++ b/gnustep-make.spec @@ -5,26 +5,23 @@ d=%{_sysconfdir}/rpm; echo $d) Name: gnustep-make -Version: 2.6.7 -Release: 3%{?dist} +Version: 2.6.8 +Release: 1%{?dist} Summary: GNUstep makefile package - Group: Development/Tools License: GPLv3+ URL: http://www.gnustep.org/ Source0: ftp://ftp.gnustep.org/pub/gnustep/core/%{name}-%{version}.tar.gz # Taken from git://fedorahosted.org/git/gnustep-rpm-macros.git -Source1: macros.gnustep +Source1: %{name}-macros.gnustep # Patch to fix #1005328 (Using Framework.mate with DESTPATH) Patch1: gnustep-make-2.6.5-framework.patch -BuildConflicts: gnustep-make -BuildRequires: automake autoconf BuildRequires: gcc-objc BuildRequires: texinfo-tex tetex-latex tetex-dvips latex2html texi2html -Requires: gnustep-filesystem = %{version}-%{release} +Requires: gnustep-filesystem%{?_isa} = %{version}-%{release} Requires(post): info Requires(preun): info @@ -46,13 +43,12 @@ License: Public Domain The gnustep-filesystem package contains the basic directory layout for GNUstep packages. - %package doc Summary: Documentation for %{name} Group: Documentation License: GPLv3+ BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: gnustep-filesystem = %{version}-%{release} %description doc The makefile package is a simple, powerful and extensible way to write @@ -65,7 +61,8 @@ This package contains documentation for %{name}. %prep %setup -q -%patch1 -p1 -b .fmwork + +cp %{SOURCE1} macros.gnustep sed -i "s|/lib/|/%{_lib}/|g" FilesystemLayouts/fhs-system sed -i "s|/lib$|/%{_lib}|g" FilesystemLayouts/fhs-system @@ -78,9 +75,8 @@ sed -i "s|=/share/GNUstep/Makefiles|=/%{_lib}/GNUstep/Makefiles|" \ FilesystemLayouts/fhs-system %build -autoreconf %configure --with-layout=fhs-system --enable-flattened -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install make install DESTDIR=%{buildroot} @@ -95,28 +91,35 @@ mkdir -p %{buildroot}%{_prefix}{,/local}/share/GNUstep/Documentation/Developer # INstall rpm macros install -d %{buildroot}%{macrosdir} -install -p %{SOURCE1} %{buildroot}%{macrosdir} +install -p -m 644 macros.gnustep %{buildroot}%{macrosdir} %post -/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : +/sbin/install-info %{_infodir}/gnustep-faq.info %{_infodir}/dir || : +/sbin/install-info %{_infodir}/gnustep-filesystem.info %{_infodir}/dir || : +/sbin/install-info %{_infodir}/gnustep-howto.info %{_infodir}/dir || : +/sbin/install-info %{_infodir}/gnustep-make.info %{_infodir}/dir || : +/sbin/install-info %{_infodir}/gnustep-userfaq.info %{_infodir}/dir || : %preun if [ $1 = 0 ] ; then - /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/gnustep-faq.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/gnustep-filesystem.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/gnustep-howto.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/gnustep-make.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/gnustep-userfaq.info %{_infodir}/dir || : fi %files -%defattr(-,root,root,-) -%doc ANNOUNCE COPYING FAQ NEWS README %config(noreplace) %{_sysconfdir}/GNUstep/GNUstep.conf %{_bindir}/* %{_libdir}/GNUstep/Makefiles %{_mandir}/man*/* -%{_infodir}/* +%{_infodir}/*.info.* %{macrosdir}/macros.gnustep %files -n gnustep-filesystem -%defattr(-,root,root,-) +%doc ANNOUNCE FAQ NEWS README +%license COPYING %dir %{_sysconfdir}/GNUstep %dir %{_libdir}/GNUstep %dir %{_libdir}/GNUstep/Applications @@ -126,11 +129,12 @@ fi %dir %{_datadir}/GNUstep/Documentation/Developer %files doc -%defattr(-,root,root,-) %doc %{_datadir}/GNUstep/Documentation/* - %changelog +* Sun Aug 21 2016 Antonio Trande - 2.6.8-1 +- Update to 2.6.8 + * Wed Feb 03 2016 Fedora Release Engineering - 2.6.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/macros.gnustep b/macros.gnustep deleted file mode 100644 index b4447ff..0000000 --- a/macros.gnustep +++ /dev/null @@ -1,50 +0,0 @@ -%gnustep_libdir %{_libdir}/GNUstep - -%gnustep_appdir %{gnustep_libdir}/Applications -%gnustep_appsupdir %{gnustep_libdir}/ApplicationSupport -%gnustep_bundledir %{gnustep_libdir}/Bundles -%gnustep_cpickdir %{gnustep_libdir}/ColorPickers -%gnustep_srvdir %{gnustep_libdir}/Services - -%gnustep_makefiles %{gnustep_libdir}/Makefiles -%gnustep_additional %{gnustep_libdir}/Makefiles/Additional -%gnustep_libraries %{gnustep_libdir}/Libraries - -%gnustep_docdir %{gnustep_libdir}/Documentation -%gnustep_devdocdic %{gnustep_docdir}/Development -%gnustep_userdocdir %{gnustep_docdir}/User -%gnustep_dtddir %{gnustep_libdir}/DTDs -%gnustep_fontdir %{gnustep_libdir}/Fonts -%gnustep_imagedir %{gnustep_libdir}/Images -%gnustep_kbdir %{gnustep_libdir}/KeyBindings -%gnustep_psdir %{gnustep_libdir}/PostScript -%gnustep_sounddir %{gnustep_libdir}/Sounds - -%gnustep_configure\ -%configure --with-installation-domain=SYSTEM - -%gnustep_make(n) make %{?_smp_mflags} \\\ -%if "X%{-n:Y}" == "X" \ - GNUSTEP_MAKEFILES=%{gnustep_makefiles} \\\ -%endif\ - messages=yes - -%gnustep_makedoc\ -make -C Documentation %{?_smp_mflags} messages=yes \\\ - GNUSTEP_MAKEFILES=%{gnustep_makefiles} - -%gnustep_install(n)\ -make install messages=yes \\\ - DESTDIR=%{buildroot} \\\ -%if "X%{-n:Y}" == "X" \ - GNUSTEP_MAKEFILES=%{gnustep_makefiles} \\\ -%endif \ - GNUSTEP_INSTALLATION_DOMAIN=SYSTEM - -%gnustep_install_without_gnustep_makefiles() %gnustep_install -n - -%gnustep_installdoc\ -make -C Documentation install messages=yes \\\ - DESTDIR=%{buildroot} \\\ - GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \\\ - GNUSTEP_MAKEFILES=%{gnustep_makefiles} diff --git a/sources b/sources index d313bf2..d6f61f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b272c985b9e7a1ac6fb27cbbb6a248b2 gnustep-make-2.6.7.tar.gz +7faa60b737e9bbb7fab69ecb14af4e61 gnustep-make-2.6.8.tar.gz