From 6f9d49120c6054cd593d4b2dd558853a4a4b37cd Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 22 Jan 2008 23:37:29 +0000 Subject: [PATCH 1/4] Initialize branch F-7 for serenity --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 93887755c1daa6defa80c7a69f146daba9e55726 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Wed, 23 Jan 2008 01:14:47 +0000 Subject: [PATCH 2/4] Initial import for F-7. --- .cvsignore | 1 + serenity.spec | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 73 insertions(+) create mode 100644 serenity.spec diff --git a/.cvsignore b/.cvsignore index e69de29..6540c41 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +serenity-1.7.1.tar.bz2 diff --git a/serenity.spec b/serenity.spec new file mode 100644 index 0000000..261eee4 --- /dev/null +++ b/serenity.spec @@ -0,0 +1,71 @@ +Name: serenity +Version: 1.7.1 +Release: 3%{?dist} +Summary: KDE Style and Window Decoration +Group: User Interface/Desktops +License: GPLv2 +URL: http://maxilys.ifastnet.com/ +Source: http://maxilys.ifastnet.com/archives/%{name}-%{version}.tar.bz2 +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +BuildRequires: kdebase-devel + +%description +Serenity is a soft and quiet theme to ease your mind, with a lot of +options to make the Serenity yours. + +%prep +%setup -q + +%build +%configure --disable-rpath \ + --with-qt-dir=%(pkg-config --variable=prefix qt-mt) \ + --with-qt-libraries=%(pkg-config --variable=libdir qt-mt) \ + --with-qt-includes=%(pkg-config --variable=includedir qt-mt) + +# remove rpath +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +make %{?_smp_mflags} + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} + +# copy/rename docs, so we don't need subdirs in docdir +install -pm 0644 style/BUGS BUGS.style +install -pm 0644 style/TODO TODO.style +install -pm 0644 style/ChangeLog ChangeLog.style +install -pm 0644 decoration/BUGS BUGS.decoration +install -pm 0644 decoration/TODO TODO.decoration +install -pm 0644 decoration/ChangeLog ChangeLog.decoration + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING GLOBAL.TINT README WARNING +%doc BUGS.* TODO.* ChangeLog.* +%{_libdir}/kde3/kstyle_serenity_config.la +%{_libdir}/kde3/kstyle_serenity_config.so +%{_libdir}/kde3/kwin3_serenity.la +%{_libdir}/kde3/kwin3_serenity.so +%{_libdir}/kde3/kwin_serenity_config.la +%{_libdir}/kde3/kwin_serenity_config.so +%{_libdir}/kde3/plugins/styles/serenity.la +%{_libdir}/kde3/plugins/styles/serenity.so +%{_datadir}/apps/kstyle/themes/serenity.themerc +%{_datadir}/apps/kwin/serenity.desktop +%{_datadir}/apps/kdisplay/color-schemes/Serenity*.kcsrc + +%changelog +* Fri Jan 18 2008 Thomas Moschny - 1.7.1-3 +- Pass the qt location to configure, otherwise it doesn't build + anymore. + +* Thu Sep 13 2007 Thomas Moschny - 1.7.1-2 +- Remove version from kdebase-devel build requirement. +- Remove obsolete 'fixme' comment. + +* Mon Sep 10 2007 Thomas Moschny - 1.7.1-1 +- Initial version. diff --git a/sources b/sources index e69de29..e021143 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +fc6ad200a3956d22afa6274cbe2d1f37 serenity-1.7.1.tar.bz2 From 1a12bde3b98421aba0f4fc0b25cbc9747c13bb5a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:38:49 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1e22a63..f1c17b0 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: serenity -# $Id$ +# $Id: Makefile,v 1.1 2008/01/22 23:37:08 kevin Exp $ NAME := serenity SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 30e45d69f1053a31c79c348f1a60f733b531033e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 12:37:09 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index f1c17b0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: serenity -# $Id: Makefile,v 1.1 2008/01/22 23:37:08 kevin Exp $ -NAME := serenity -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7