From 2b11528c07fd4fd656255b95e4325a114da85bb3 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Jul 07 2021 15:47:30 +0000 Subject: import #1978947 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8b04e6f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/NsCDE-1.2.tar.gz diff --git a/4cc99758c02bc1f0bf70e38c25427cc5cc557227.patch b/4cc99758c02bc1f0bf70e38c25427cc5cc557227.patch new file mode 100644 index 0000000..3f45cf6 --- /dev/null +++ b/4cc99758c02bc1f0bf70e38c25427cc5cc557227.patch @@ -0,0 +1,80 @@ +From 4cc99758c02bc1f0bf70e38c25427cc5cc557227 Mon Sep 17 00:00:00 2001 +From: Davide Cavalca +Date: Sat, 3 Jul 2021 08:40:28 -0700 +Subject: [PATCH] Pass build flags from the environment if available + +--- + src/XOverrideFontCursor/Makefile | 6 +++++- + src/colorpicker/Makefile | 6 ++++-- + src/pclock-0.13.1/Makefile | 4 ++-- + src/pclock-0.13.1/src/Makefile | 7 ++++--- + 4 files changed, 15 insertions(+), 8 deletions(-) + +diff --git a/src/XOverrideFontCursor/Makefile b/src/XOverrideFontCursor/Makefile +index 064eeccd..563a2560 100644 +--- a/src/XOverrideFontCursor/Makefile ++++ b/src/XOverrideFontCursor/Makefile +@@ -1,5 +1,9 @@ ++CC ?= gcc ++CFLAGS ?= ++LDFLAGS ?= ++ + XOverrideFontCursor.so: +- gcc -I/usr/include/X11 -I/usr/local/include/X11 -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R7/include -I/usr/X11R6/include/X11 -I/usr/X11R7/include/X11 -L/usr/X11R6/lib -L/usr/X11R7/lib -L/usr/local/lib -lX11 -fPIC -shared XOverrideFontCursor.c -o XOverrideFontCursor.so ++ $(CC) -I/usr/include/X11 -I/usr/local/include/X11 -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R7/include -I/usr/X11R6/include/X11 -I/usr/X11R7/include/X11 -L/usr/X11R6/lib -L/usr/X11R7/lib $(CFLAGS) -L/usr/local/lib -lX11 -fPIC $(LDFLAGS) -shared XOverrideFontCursor.c -o XOverrideFontCursor.so + + clean: + rm XOverrideFontCursor.so +diff --git a/src/colorpicker/Makefile b/src/colorpicker/Makefile +index 5e4259d8..a4b4dcad 100644 +--- a/src/colorpicker/Makefile ++++ b/src/colorpicker/Makefile +@@ -1,7 +1,9 @@ +-CC=gcc ++CC ?= gcc ++CFLAGS ?= ++LDFLAGS ?= + + colorpicker: main.c +- $(CC) -o colorpicker main.c `pkg-config --libs --cflags x11` ++ $(CC) -o colorpicker $(CFLAGS) main.c `pkg-config --libs --cflags x11` $(LDFLAGS) + + clean: + rm -f colorpicker +diff --git a/src/pclock-0.13.1/Makefile b/src/pclock-0.13.1/Makefile +index 41dd3d0e..613bc14d 100644 +--- a/src/pclock-0.13.1/Makefile ++++ b/src/pclock-0.13.1/Makefile +@@ -1,5 +1,5 @@ + all: +- (cd src && make all) ++ cd src && $(MAKE) all + + install: +- (cd src && make install) ++ cd src && $(MAKE) install +diff --git a/src/pclock-0.13.1/src/Makefile b/src/pclock-0.13.1/src/Makefile +index d7fd891b..bf8dd5f2 100644 +--- a/src/pclock-0.13.1/src/Makefile ++++ b/src/pclock-0.13.1/src/Makefile +@@ -7,8 +7,9 @@ DEFAULT_XPM = Fpclock.xpm + + INCDIR = -I/usr/X11R6/include -I/usr/X11R7/include -I/usr/include -I/usr/local/include -I. + LIBDIR = -L/usr/X11R6/lib -L/usr/X11R7/lib -L/usr/lib64 -L/usr/local/lib +-CC = gcc +-CFLAGS = -O2 -g -Wall ++CC ?= gcc ++CFLAGS ?= -O2 -g -Wall ++LDFLAGS ?= + LIBS = -lXpm -lXext -lX11 -lm + + ############################################################################### +@@ -34,7 +35,7 @@ Graphics.o: PClock.h Default.xpm + Main.o: PClock.h Defaults.h Version.h + + $(PROG): $(OBJS) +- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBDIR) $(LIBS) ++ $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBDIR) $(LDFLAGS) $(LIBS) + + ############################################################################### + diff --git a/NsCDE.spec b/NsCDE.spec new file mode 100644 index 0000000..a5d44ca --- /dev/null +++ b/NsCDE.spec @@ -0,0 +1,185 @@ +Name: NsCDE +Version: 1.2 +Release: 1%{?dist} +Summary: Modern and functional CDE desktop based on FVWM + +License: GPLv3 +URL: https://github.com/NsCDE/NsCDE +Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.gz +# Pass build flags from the environment if available +Patch0: %{url}/commit/4cc99758c02bc1f0bf70e38c25427cc5cc557227.patch + +# For the installer +BuildRequires: cpp +BuildRequires: dunst +BuildRequires: fvwm +BuildRequires: gettext +BuildRequires: ImageMagick +BuildRequires: ksh +BuildRequires: python3-psutil +BuildRequires: python3-qt5 +BuildRequires: python3-yaml +BuildRequires: redhat-menus +BuildRequires: sed +BuildRequires: stalonetray +BuildRequires: xdotool +BuildRequires: xdpyinfo +BuildRequires: xprop +BuildRequires: xrandr +BuildRequires: xrdb +BuildRequires: xrefresh +BuildRequires: xscreensaver +BuildRequires: xset +BuildRequires: xsettingsd + +# For rebuilding the bundled precompiled binaries +BuildRequires: make +BuildRequires: gcc +BuildRequires: libX11-devel +BuildRequires: libXext-devel +BuildRequires: libXpm-devel +BuildRequires: libxcb-devel + +Requires: %{name}-data = %{version}-%{release} +Requires: %{name}-doc = %{version}-%{release} + +Requires: cpp +Requires: fvwm +Requires: gettext +Requires: ImageMagick +Requires: ksh +Requires: python3-psutil +Requires: python3-qt5 +Requires: python3-yaml +Requires: redhat-menus +Requires: xdotool +Requires: xdpyinfo +Requires: xprop +Requires: xrandr +Requires: xrdb +Requires: xrefresh +Requires: xset +Requires: xsettingsd + +Recommends: dunst +Recommends: stalonetray +Recommends: sudo +Recommends: xscreensaver + +# These are an integral part of NsCDE and have been specifically modified +Provides: bundled(colorpicker) = 0 +Provides: bundled(pclock) = 0.13.1 +Provides: bundled(XOverrideFontCursor) = 20190901 + +%description +NsCDE is a retro but powerful UNIX desktop environment which resembles CDE look +(and partially feel) but with a more powerful and flexible framework +beneath-the-surface, more suited for 21st century UNIX-like and Linux systems +and user requirements than original CDE. + +%package data +Summary: Data files for %{name} +BuildArch: noarch +%description data +This package contains data files for %{name}. + +%package doc +Summary: Documentation files for %{name} +BuildArch: noarch +%description doc +This package contains documentation for %{name}. + +%prep +%autosetup -p1 +# remove bundled precompiled libraries and binaries +rm src/colorpicker/colorpicker-bin.* +rm src/pclock-0.13.1/pclock-bin.* +rm src/XOverrideFontCursor/XOverrideFontCursor.so.* + +%build +%set_build_flags +%make_build -C src/colorpicker +%make_build -C src/pclock-0.13.1/src +%make_build -C src/XOverrideFontCursor + +%install +# install to a temporary directory to make it easier to shuffle things around +./Installer.ksh \ + -D instroot \ + -p %{_libdir}/%{name} \ + -I nowhere \ + -w \ + -n \ + -i + +nscde=instroot%{_libdir}/%{name} + +# Icons +mkdir -p %{buildroot}%{_datadir}/icons +mv ${nscde}/share/icons/freedesktop/theme/NsCDE %{buildroot}%{_datadir}/icons/ +rm -r ${nscde}/share/icons/freedesktop +mv ${nscde}/share/icons/cursors %{buildroot}%{_datadir}/icons/NsCDE + +# xsessions +mv instroot%{_datadir}/xsessions %{buildroot}%{_datadir}/ +rmdir instroot%{_datadir} + +# Docs, xsessions +mkdir -p %{buildroot}%{_docdir}/%{name}-doc +mv ${nscde}/share/doc/* %{buildroot}%{_docdir}/%{name}-doc +rmdir ${nscde}/share/doc + +# Locales +mv ${nscde}/share/locale %{buildroot}%{_datadir}/ +rm %{buildroot}%{_datadir}/locale/*/*/*.po +%find_lang NsCDE --all-name + +# Other data files +mkdir -p %{buildroot}%{_datadir}/%{name} +mv ${nscde}/share/* %{buildroot}%{_datadir}/%{name} +ln -s ../../..%{_docdir}/%{name}-doc %{buildroot}%{_datadir}/%{name}/doc +rmdir ${nscde}/share + +# Config files +mkdir -p %{buildroot}%{_sysconfdir}/%{name} %{buildroot}%{_sysconfdir}/xdg/menus +mv ${nscde}/config/xdg/menus/* %{buildroot}%{_sysconfdir}/xdg/menus/ +rmdir ${nscde}/config/xdg/menus +rmdir ${nscde}/config/xdg +mv ${nscde}/config/* %{buildroot}%{_sysconfdir}/%{name} +rmdir ${nscde}/config + +# Everything else +mkdir -p %{buildroot}%{_libdir}/%{name} +mv ${nscde}/{bin,lib,libexec} %{buildroot}%{_libdir}/%{name} +ln -s ../../..%{_sysconfdir}/%{name} %{buildroot}%{_libdir}/%{name}/config +ln -s ../../..%{_datadir}/%{name} %{buildroot}%{_libdir}/%{name}/share +rmdir $nscde +rmdir instroot%{_libdir} +rmdir instroot%{_prefix} +rmdir instroot + +%files -f NsCDE.lang +%license COPYING +%doc README.md ReleaseNotes.txt README.localization TODO ChangeLog NsCDE.png +%{_libdir}/%{name} +%dir %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/*.conf +%config(noreplace) %{_sysconfdir}/%{name}/*.actions +%config(noreplace) %{_sysconfdir}/xdg/menus/nscde-applications.menu + +%files data +%license COPYING +%{_datadir}/xsessions/nscde.desktop +%{_datadir}/icons/NsCDE +%{_datadir}/%{name} + +%files doc +%license COPYING +%doc %{_docdir}/%{name}-doc/NsCDE.pdf +%doc %{_docdir}/%{name}-doc/NsCDE.txt +%doc %{_docdir}/%{name}-doc/examples +%doc %{_docdir}/%{name}-doc/html + +%changelog +* Sat Jul 03 2021 Davide Cavalca - 1.2-1 +- Initial package diff --git a/sources b/sources new file mode 100644 index 0000000..760d067 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (NsCDE-1.2.tar.gz) = 5db3608f83b49724aa3cf4fc1c2a00b67dcb128522fd839a0520bae6a5f2ad2aa15d65fcc202ead6ee2cfe5b733196ca39eb8c4b814c3705682d620676851c05