rpms/quassel/devel .cvsignore, 1.11, 1.12 quassel.spec, 1.16, 1.17 sources, 1.11, 1.12 quassel.desktop, 1.2, NONE quassel.png, 1.2, NONE quasselclient.desktop, 1.2, NONE quasselcore.desktop, 1.2, NONE
Rex Dieter
rdieter at fedoraproject.org
Sat May 1 19:39:16 UTC 2010
- Previous message: rpms/boolstuff/F-12 .cvsignore, 1.2, 1.3 boolstuff.spec, 1.9, 1.10 sources, 1.2, 1.3 boolstuff-0.1.11-gcc43.patch, 1.1, NONE boolstuff-0.1.11-gcc44-fixes.diff, 1.1, NONE
- Next message: rpms/SDL_mixer/devel SDL_mixer.spec,1.30,1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/quassel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18211
Modified Files:
.cvsignore quassel.spec sources
Removed Files:
quassel.desktop quassel.png quasselclient.desktop
quasselcore.desktop
Log Message:
* Sat May 01 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.6.1-1
- quassel-0.6.1
- -common subpkg
- add minimal qt4/kdelibs4 deps
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore 16 Feb 2010 11:47:17 -0000 1.11
+++ .cvsignore 1 May 2010 19:39:16 -0000 1.12
@@ -1 +1 @@
-quassel-0.5.2.tar.bz2
+quassel-0.6.1.tar.bz2
Index: quassel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/devel/quassel.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- quassel.spec 16 Feb 2010 11:47:18 -0000 1.16
+++ quassel.spec 1 May 2010 19:39:16 -0000 1.17
@@ -1,22 +1,24 @@
Name: quassel
Summary: A modern distrubuted IRC system
-Version: 0.5.2
+Version: 0.6.1
Release: 1%{?dist}
License: GPLv2 or GPLv3
Group: Applications/Internet
URL: http://quassel-irc.org/
-Source0: http://quassel-irc.org/system/files/quassel-%{version}.tar.bz2
-Source1: %{name}.desktop
-Source2: %{name}core.desktop
-Source3: %{name}client.desktop
-Source4: %{name}.png
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-Requires: qt-sqlite, openssl
-BuildRequires: qt-devel, openssl-devel, kdebase-workspace-devel
-BuildRequires: cmake, kde-filesystem
+Source0: http://quassel-irc.org/pub/quassel-%{version}.tar.bz2
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+Buildrequires: cmake
BuildRequires: desktop-file-utils
+buildRequires: kdebase-workspace-devel
+BuildRequires: kde-filesystem
+BuildRequires: openssl-devel
+BuildRequires: qt4-devel
+
+Provides: %{name}-gui = %{version}-%{release}
+
+Requires: %{name}-common = %{version}-%{release}
%description
Quassel IRC is a modern, distributed IRC client,
@@ -25,6 +27,20 @@ to and detach from a central core --
much like the popular combination of screen and a
text-based IRC client such as WeeChat, but graphical
+%package common
+Summary: Quassel common/shared files
+Group: Applications/Internet
+# not strictly required, but helps this get pulled out when
+# someone removes %%name or %%name-client
+Requires: %{name}-gui = %{version}-%{release}
+# put here for convenience, instead of all subpkgs which
+# provide %%{name}-gui
+%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
+%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
+BuildArch: noarch
+%description common
+%{summary}.
+
%package core
Summary: Quassel core component
Group: Applications/Internet
@@ -35,79 +51,76 @@ server, and allows for multiple clients
%package client
Summary: Quassel client
Group: Applications/Internet
+Provides: %{name}-gui = %{version}-%{release}
+Requires: %{name}-common = %{version}-%{release}
%description client
Quassel client
+
%prep
%setup -q -n %{name}-%{version}
%build
-
mkdir build
-cd build
+pushd build
%{cmake_kde4} .. -DWANT_MONO=1 -DWITH_KDE=1
-make
+popd
+
+make %{?_smp_mflags} -C build
%install
rm -rf $RPM_BUILD_ROOT
+make install/fast DESTDIR=${RPM_BUILD_ROOT} -C build
-cd build
-make install DESTDIR=${RPM_BUILD_ROOT}
+# unpackaged files
+rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/quassel.png
%clean
rm -rf $RPM_BUILD_ROOT
-%post
+%post common
touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-%postun
+%postun common
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &> /dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
fi
-%posttrans
+%posttrans common
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-%post client
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-
-%postun client
-if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &> /dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-fi
-
-%posttrans client
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-
-
%files
%defattr(-,root,root,-)
-%attr(755,root,root) %{_bindir}/quassel
-%doc COPYING gpl-2.0.txt gpl-3.0.txt README
-%{_kde4_appsdir}/quassel/
-/usr/share/icons/hicolor/48x48/apps/quassel.png
-# pixmaps dir is deprecated, not needed anymore -- Rex
-/usr/share/pixmaps/quassel.png
+%{_kde4_bindir}/quassel
%{_kde4_datadir}/applications/kde4/quassel.desktop
+%files common
+%defattr(-,root,root,-)
+%doc COPYING README
+%doc gpl-2.0.txt gpl-3.0.txt
+%{_kde4_appsdir}/quassel/
+%{_kde4_iconsdir}/hicolor/*/*/*
+
%files core
%defattr(-,root,root,-)
-%attr(755,root,root) %{_bindir}/quasselcore
-%doc COPYING gpl-2.0.txt gpl-3.0.txt README
+%doc COPYING README
+%doc gpl-2.0.txt gpl-3.0.txt
+%{_kde4_bindir}/quasselcore
%files client
%defattr(-,root,root,-)
-%attr(755,root,root) %{_bindir}/quasselclient
-%doc COPYING gpl-2.0.txt gpl-3.0.txt README
-%{_kde4_appsdir}/quassel/
-/usr/share/icons/hicolor/48x48/apps/quassel.png
-/usr/share/pixmaps/quassel.png
+%{_kde4_bindir}/quasselclient
%{_kde4_datadir}/applications/kde4/quasselclient.desktop
+
%changelog
+* Sat May 01 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.6.1-1
+- quassel-0.6.1
+- -common subpkg
+- add minimal qt4/kdelibs4 deps
+
* Mon Feb 15 2010 Steven Parrish <smparrish at gmail.com> - 0.5.2-1
- New bugfix release
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/quassel/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources 16 Feb 2010 11:47:18 -0000 1.11
+++ sources 1 May 2010 19:39:16 -0000 1.12
@@ -1 +1 @@
-b94cbd1f63db8e22f53360b32bb955b7 quassel-0.5.2.tar.bz2
+569d310d06f124952009704d55a98100 quassel-0.6.1.tar.bz2
--- quassel.desktop DELETED ---
--- quasselclient.desktop DELETED ---
--- quasselcore.desktop DELETED ---
- Previous message: rpms/boolstuff/F-12 .cvsignore, 1.2, 1.3 boolstuff.spec, 1.9, 1.10 sources, 1.2, 1.3 boolstuff-0.1.11-gcc43.patch, 1.1, NONE boolstuff-0.1.11-gcc44-fixes.diff, 1.1, NONE
- Next message: rpms/SDL_mixer/devel SDL_mixer.spec,1.30,1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list