From 2cc6fb4f092615f03942748efe687a0b0858b53e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Bl=C3=A4ttermann?= Date: Wed, 27 Jul 2011 21:53:58 +0200 Subject: [PATCH 1/2] Initial commit --- .gitignore | 1 + sources | 1 + wmdrawer-Makefile.patch | 43 ++++++++++++++++++ wmdrawer.spec | 99 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 144 insertions(+) create mode 100644 wmdrawer-Makefile.patch create mode 100644 wmdrawer.spec diff --git a/.gitignore b/.gitignore index e69de29..17b7149 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/wmdrawer-0.10.5.tar.gz diff --git a/sources b/sources index e69de29..fecb2ba 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +608bf2f75fdd084f8e63764c31a2a9a5 wmdrawer-0.10.5.tar.gz diff --git a/wmdrawer-Makefile.patch b/wmdrawer-Makefile.patch new file mode 100644 index 0000000..b84e021 --- /dev/null +++ b/wmdrawer-Makefile.patch @@ -0,0 +1,43 @@ +--- Makefile 2011-07-26 20:13:12.445971425 +0200 ++++ Makefile 2011-07-26 20:16:05.724994299 +0200 +@@ -16,27 +16,27 @@ + DOCDIR = $(PREFIX)/share/doc + + # Image library +-USE_GDKPIXBUF = 1 +-#USE_GDKPIXBUF2 = 1 ++#USE_GDKPIXBUF = 1 ++USE_GDKPIXBUF2 = 1 + #USE_IMLIB = 1 + + DEFS = $(OS) + + ifdef USE_GDKPIXBUF + IMGLIB_DEF = -DUSE_GDKPIXBUF +-CFLAGS = -O3 -Wall `gdk-pixbuf-config --cflags` ++override CFLAGS += -O3 -Wall `gdk-pixbuf-config --cflags` + LDFLAGS = `gdk-pixbuf-config --libs` -lgdk_pixbuf_xlib + endif + + ifdef USE_GDKPIXBUF2 + IMGLIB_DEF = -DUSE_GDKPIXBUF2 +-CFLAGS = -O3 -Wall `pkg-config --cflags gdk-pixbuf-xlib-2.0` -I/usr/X11R6/include ++override CFLAGS += -O3 -Wall `pkg-config --cflags gdk-pixbuf-xlib-2.0` -I/usr/X11R6/include + LDFLAGS = `pkg-config --libs gdk-pixbuf-xlib-2.0` -rdynamic -lX11 -lXi -lXext -L/usr/X11R6/lib + endif + + ifdef USE_IMLIB + IMGLIB_DEF = -DUSE_IMLIB +-CFLAGS = -O3 -Wall `imlib-config --cflags` ++override CFLAGS += -O3 -Wall `imlib-config --cflags` + LDFLAGS = `imlib-config --libs` + endif + +@@ -62,7 +62,6 @@ + + wmdrawer : $(OBJS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) +- strip $@ + + clean : + $(RM) *.o $(PRGS) diff --git a/wmdrawer.spec b/wmdrawer.spec new file mode 100644 index 0000000..70b7518 --- /dev/null +++ b/wmdrawer.spec @@ -0,0 +1,99 @@ +Name: wmdrawer +Version: 0.10.5 +Release: 10%{?dist} + +Summary: Retractable button bar launcher dockapp +Summary(de): Dockapp mit ausklappbaren Programmstartern +Source0: http://people.easter-eggs.org/~valos/%{name}/%{name}-%{version}.tar.gz +Patch0: %{name}-Makefile.patch +License: GPLv2+ +Group: User Interface/X +URL: http://people.easter-eggs.org/~valos/%{name}/ +BuildRequires: libXext-devel +BuildRequires: libX11-devel +BuildRequires: libXi-devel +BuildRequires: gdk-pixbuf2-devel +BuildRequires: dos2unix +Requires: xorg-x11-fonts-misc + +%description +wmDrawer is a dock application (dockapp) which provides a drawer +(retractable button bar) to launch applications. + +Please copy the file /usr/share/doc/%{name}-%{version}/wmdrawerrc to +~/.wmdrawerrc and edit it to match your needs. + +%description -l de +wmDrawer ist ein Dockapp, welches eine ausklappbare +Knopfleiste mit Anwendungsstartern darstellt. + +Bitte kopieren Sie die Datei /usr/share/doc/%{name}-%{version}/wmdrawerrc +nach ~/.wmdrawerrc und bearbeiten Sie sie nach Ihren Wünschen. + + +%prep +%setup -q +%patch0 -p0 + + +%build +make -L CFLAGS='%{optflags}' %{?_smp_mflags} + +%install + + +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_mandir}/man1 +install -p -m 755 %{name} %{buildroot}%{_bindir}/%{name} +install -p -m 644 doc/%{name}.1x.* %{buildroot}%{_mandir}/man1 + +dos2unix -k %{buildroot}%{_docdir}/AUTHORS \ + %{buildroot}%{_docdir}/ChangeLog \ + %{buildroot}%{_docdir}/%{name}-it.sgml + +%files +%defattr(-,root,root,-) +%doc wmdrawerrc.example AUTHORS ChangeLog COPYING INSTALL README TODO doc/*.sgml +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1x.* + +%changelog + +* Tue Jul 26 2011 Mario Blättermann 0.10.5-10 +- Added patch for the Makefile. Debug package is usable now. + (Thanks to Richard Shaw) +- Changed some files to utf-8 with correct line endings. +- Added font dependency + +* Fri Mar 25 2011 Mario Blättermann 0.10.5-9 +- Dropped startup script due to continuing problems +- Added hint regarding the startup behavior to the description + +* Mon Feb 14 2011 Mario Blättermann 0.10.5-8 +- changed Group again +- changed make call +- use macros consistently +- moved startup script to its own file + +* Mon Oct 26 2008 Mario Blättermann 0.10.5-7mud2009.0 +- fixed Group + +* Wed Oct 15 2008 Mario Blättermann 0.10.5-6mud2009.0 +- rebuild for 2009.0 + +* Sat Apr 12 2008 Mario Blättermann 0.10.5-5mud2008.1 +- fixed Requires and BuildRequires +- rebuild for mud2008.0 + +* Sat Mar 15 2008 Mario Blättermann 0.10.5-4mud2008.0 +- fixed bug in startup script + +* Thu Jan 03 2008 Oliver Burger 0.10.5-3mud2008.0 +- rebuild for MUde +- changed from csh to bash-script + +* Thu Jan 03 2008 Mario Blättermann +- add startup script and xdg menu entry + +* Mon Dec 03 2007 Mario Blättermann +-initial version From f2514bf5833421c12c229ce4c0b714c5df74c1f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Bl=C3=A4ttermann?= Date: Wed, 27 Jul 2011 22:18:10 +0200 Subject: [PATCH 2/2] - Changed arguments for dos2unix --- wmdrawer.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/wmdrawer.spec b/wmdrawer.spec index 70b7518..674edd9 100644 --- a/wmdrawer.spec +++ b/wmdrawer.spec @@ -1,6 +1,6 @@ Name: wmdrawer Version: 0.10.5 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Retractable button bar launcher dockapp Summary(de): Dockapp mit ausklappbaren Programmstartern @@ -47,18 +47,21 @@ mkdir -p %{buildroot}%{_mandir}/man1 install -p -m 755 %{name} %{buildroot}%{_bindir}/%{name} install -p -m 644 doc/%{name}.1x.* %{buildroot}%{_mandir}/man1 -dos2unix -k %{buildroot}%{_docdir}/AUTHORS \ - %{buildroot}%{_docdir}/ChangeLog \ - %{buildroot}%{_docdir}/%{name}-it.sgml +dos2unix -k AUTHORS \ + ChangeLog %files %defattr(-,root,root,-) -%doc wmdrawerrc.example AUTHORS ChangeLog COPYING INSTALL README TODO doc/*.sgml +%doc wmdrawerrc.example AUTHORS ChangeLog COPYING INSTALL README TODO %{_bindir}/%{name} %{_mandir}/man1/%{name}.1x.* %changelog +* Wed Jul 27 2011 Mario Blättermann 0.10.5-11 +- Changed arguments for dos2unix +- Dropped *.sgml files + * Tue Jul 26 2011 Mario Blättermann 0.10.5-10 - Added patch for the Makefile. Debug package is usable now. (Thanks to Richard Shaw)