rpms/spectrum/devel import.log, NONE, 1.1 spectrum-0.3-cmake.patch, NONE, 1.1 spectrum.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Mon Jun 21 08:48:20 UTC 2010

Author: mcepl

Update of /cvs/pkgs/rpms/spectrum/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30541/devel

Modified Files:
	.cvsignore sources 
Added Files:
	import.log spectrum-0.3-cmake.patch spectrum.spec 
Log Message:
Initial importing of the package to Fedora CVS

--- NEW FILE import.log ---
spectrum-0_3-0_9_git20100614_fc14:HEAD:spectrum-0.3-0.9.git20100614.fc14.src.rpm:1277110057

spectrum-0.3-cmake.patch:
 CMakeLists.txt                                    |   30 +-----------
 cmake_modules/FindPackageHandleStandardArgs.cmake |   54 ++++++++++++++++++++++
 2 files changed, 57 insertions(+), 27 deletions(-)

--- NEW FILE spectrum-0.3-cmake.patch ---
diff -up spectrum/CMakeLists.txt.RH-build spectrum/CMakeLists.txt
--- spectrum/CMakeLists.txt.RH-build	2010-05-25 22:00:59.000000000 +0200
+++ spectrum/CMakeLists.txt	2010-06-12 17:37:28.000000000 +0200
@@ -1,6 +1,6 @@
 project(spectrum)
  
-cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
+#cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
 if(COMMAND cmake_policy)
 	cmake_policy(SET CMP0003 NEW)
 endif(COMMAND cmake_policy)
@@ -190,9 +190,9 @@ set(spectrum_MOC_HDRS
 add_executable(spectrum ${spectrum_SRCS} ${lrelease_outputs})
 
 if(DEFINED WITH_STATIC_GLOOX)
-	target_link_libraries(spectrum ${WITH_STATIC_GLOOX} -lgnutls ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBPOCO_LIBRARIES} -export-dynamic)
+	target_link_libraries(spectrum ${WITH_STATIC_GLOOX} -lgnutls ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBPOCO_LIBRARIES} -export-dynamic -lgthread-2.0 -lpthread)
 else(DEFINED WITH_STATIC_GLOOX)
-	target_link_libraries(spectrum ${GLOOX_LIBRARIES} ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBPOCO_LIBRARIES} -export-dynamic)
+	target_link_libraries(spectrum ${GLOOX_LIBRARIES} ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${LIBPOCO_LIBRARIES} -export-dynamic -lgthread-2.0 -lpthread)
 endif(DEFINED WITH_STATIC_GLOOX)
 
 message(STATUS "Transport will be installed into: " ${CMAKE_INSTALL_PREFIX})
@@ -333,30 +333,6 @@ ELSE(NOT GETTEXT_MSGFMT_EXECUTABLE)
  
         ADD_CUSTOM_TARGET(translations ALL)
  
-        FILE(GLOB PO_FILES  ${CMAKE_CURRENT_SOURCE_DIR}/po/*.po)
- 
-        FOREACH(_poFile ${PO_FILES})
-                GET_FILENAME_COMPONENT(_poFileName ${_poFile} NAME)
-                STRING(REGEX REPLACE "^${catalogname}_?" "" _langCode ${_poFileName} )
-                STRING(REGEX REPLACE "\\.po$" "" _langCode ${_langCode} )
-				STRING(REGEX REPLACE "\\messages" "" _langCode ${_langCode} )
- 
-                IF( _langCode )
-                        GET_FILENAME_COMPONENT(_lang po/${_poFile} NAME_WE)
-                        SET(_gmoFile ${CMAKE_CURRENT_SOURCE_DIR}/po/${_lang}.mo)
- 
-                        ADD_CUSTOM_COMMAND(TARGET translations
-                                COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --check -o ${_gmoFile} ${_poFile}
-                                DEPENDS ${_poFile})
-
-                        ADD_CUSTOM_COMMAND(TARGET xgettext
-                                COMMAND msgmerge ${_poFile} ${CMAKE_CURRENT_SOURCE_DIR}/po/messages.po | msgattrib --no-obsolete > ${_poFile}.new && mv ${_poFile}.new ${_poFile}
-								)
-                        INSTALL(FILES ${_gmoFile} DESTINATION share/locale/${_langCode}/LC_MESSAGES/ RENAME ${catalogname}.mo)
-                ENDIF( _langCode )
- 
-        ENDFOREACH(_poFile ${PO_FILES})
- 
 ENDIF(NOT GETTEXT_MSGFMT_EXECUTABLE)
 
 
diff -up /dev/null spectrum/cmake_modules/FindPackageHandleStandardArgs.cmake
--- /dev/null	2010-06-12 14:39:21.762162615 +0200
+++ spectrum/cmake_modules/FindPackageHandleStandardArgs.cmake	2010-06-12 17:37:28.000000000 +0200
@@ -0,0 +1,54 @@
+# FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME (DEFAULT_MSG|"Custom failure message") VAR1 ... )
+#    This macro is intended to be used in FindXXX.cmake modules files.
+#    It handles the REQUIRED and QUIET argument to FIND_PACKAGE() and
+#    it also sets the <UPPERCASED_NAME>_FOUND variable.
+#    The package is found if all variables listed are TRUE.
+#    Example:
+#
+#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR)
+#
+#    LibXml2 is considered to be found, if both LIBXML2_LIBRARIES and 
+#    LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set to TRUE.
+#    If it is not found and REQUIRED was used, it fails with FATAL_ERROR, 
+#    independent whether QUIET was used or not.
+#    If it is found, the location is reported using the VAR1 argument, so 
+#    here a message "Found LibXml2: /usr/lib/libxml2.so" will be printed out.
+#    If the second argument is DEFAULT_MSG, the message in the failure case will 
+#    be "Could NOT find LibXml2", if you don't like this message you can specify
+#    your own custom failure message there.
+
+MACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FAIL_MSG _VAR1 )
+
+  IF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
+    SET(_FAIL_MESSAGE "Could NOT find ${_NAME}")
+  ELSE("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
+    SET(_FAIL_MESSAGE "${_FAIL_MSG}")
+  ENDIF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
+
+  STRING(TOUPPER ${_NAME} _NAME_UPPER)
+
+  SET(${_NAME_UPPER}_FOUND TRUE)
+  IF(NOT ${_VAR1})
+    SET(${_NAME_UPPER}_FOUND FALSE)
+  ENDIF(NOT ${_VAR1})
+
+  FOREACH(_CURRENT_VAR ${ARGN})
+    IF(NOT ${_CURRENT_VAR})
+      SET(${_NAME_UPPER}_FOUND FALSE)
+    ENDIF(NOT ${_CURRENT_VAR})
+  ENDFOREACH(_CURRENT_VAR)
+
+  IF (${_NAME_UPPER}_FOUND)
+    IF (NOT ${_NAME}_FIND_QUIETLY)
+        MESSAGE(STATUS "Found ${_NAME}: ${${_VAR1}}")
+    ENDIF (NOT ${_NAME}_FIND_QUIETLY)
+  ELSE (${_NAME_UPPER}_FOUND)
+    IF (${_NAME}_FIND_REQUIRED)
+        MESSAGE(FATAL_ERROR "${_FAIL_MESSAGE}")
+    ELSE (${_NAME}_FIND_REQUIRED)
+      IF (NOT ${_NAME}_FIND_QUIETLY)
+        MESSAGE(STATUS "${_FAIL_MESSAGE}")
+      ENDIF (NOT ${_NAME}_FIND_QUIETLY)
+    ENDIF (${_NAME}_FIND_REQUIRED)
+  ENDIF (${_NAME_UPPER}_FOUND)
+ENDMACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS)


--- NEW FILE spectrum.spec ---
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?_initddir: %global _initddir %{_initrddir}}

%global groupname spectrum
%global username spectrum

Summary: XMPP transport/gateway
Name: spectrum
Version: 0.3
Release: 0.9.git20100614%{?dist}
Group: System Environment/Daemons
# spectrumctl is GPLv3+, rest GPLv2+
License: GPLv2+ and GPLv3+
# git clone http://github.com/hanzz/spectrum.git
# git archive --prefix=spectrum/ d55ba67ea9dc | bzip2 >spectrum.tar.bz2
Source0: %{name}.tar.bz2
# Patch to make spectrum build with an obsolete cmake on RHEL-5
Patch1: spectrum-%{version}-cmake.patch
URL: http://spectrum.im/
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: libpurple-devel
BuildRequires: poco-devel
BuildRequires: gloox-devel
BuildRequires: cppunit-devel
BuildRequires: cmake
BuildRequires: python2-devel
Requires: logrotate
Requires: python-xmpp
Requires(pre): shadow-utils
Requires(preun): initscripts, chkconfig
Requires(post): chkconfig
%if 0%{?rhel} <= 5 && 0%{?fedora} < 7
ExcludeArch: ppc
%endif

%description
Spectrum is an XMPP transport/gateway. It allows XMPP users to communicate with
their friends who are using one of the supported networks. Spectrum is written
in C++ and uses the Gloox XMPP library and libpurple for “legacy networks”.
Spectrum supports a wide range of different networks such as ICQ, XMPP (Jabber,
GTalk), AIM, MSN, Facebook, Twitter, Gadu-Gadu, IRC and SIMPLE.
%if 0%{?rhel} <= 5 && 0%{?fedora} < 7
Users of RHEL-5 Server need to have RHEL Optional Productivity Apps channel
switched on in order to get libpurple.
%endif

%prep
%setup -q -n %{name}

%if 0%{?rhel} <= 5 && 0%{?fedora} < 7
%patch1 -p1 -b .RH-build
%endif

rm -vf po/*.po

%build
%cmake .
make VERBOSE=1 %{?_smp_mflags}
(cd spectrumctl && python setup.py build)

cat <<EOS >spectrum-logrotate
/var/log/spectrum/*.log {
    rotate 5
    size 1M
    missingok
    notifempty
}
EOS

%install
rm -rf %{buildroot}

make install DESTDIR=%{buildroot}
# To work around these issues in 'make install':
# - spectrum.cfg contains secret and should not be world readable...
# - it wont install $DESTDIR/etc/spectrum/spectrum.cfg
#   if /etc/spectrum/spectrum.cfg exists. (would not be included in rpm)
install -p -D -m 640 spectrum.cfg \
	%{buildroot}%{_sysconfdir}/spectrum/spectrum.cfg

(cd spectrumctl && \
    python setup.py install --root %{buildroot} --prefix %{_prefix} \
)

# Stuff that 'make install' does not install:
install -p -D -m 644 schemas/sqlite_schema.sql \
	%{buildroot}%{_datadir}/spectrum/schemas/sqlite_schema.sql
install -p -D -m 644 schemas/mysql_schema.sql \
	%{buildroot}%{_datadir}/spectrum/schemas/mysql_schema.sql
install -p -D -m 755 initscripts/fedora/spectrum \
	%{buildroot}%{_initddir}/spectrum
install -p -D -m 644 spectrum-logrotate \
	%{buildroot}%{_sysconfdir}/logrotate.d/spectrum

install -d %{buildroot}%{_localstatedir}/{lib,run,log}/spectrum

# move daemon binary to /usr/sbin
install -d %{buildroot}%{_sbindir}
mv %{buildroot}%{_bindir}/spectrum %{buildroot}%{_sbindir}

# move spectrum.cfg.example
mv %{buildroot}%{_docdir}/spectrum/spectrum.cfg.example .

%clean
rm -rf %{buildroot}

%pre
getent group %{groupname} >/dev/null || groupadd -r %{groupname}
getent passwd %{username} >/dev/null || \
    useradd -r -g %{groupname} -d %{_localstatedir}/lib/spectrum \
        -s /sbin/nologin \
        -c "spectrum XMPP transport" %{username}
exit 0

%post
/sbin/chkconfig --add spectrum

%preun
if [ $1 = 0 ]; then
    /sbin/service spectrum stop >/dev/null 2>&1
    /sbin/chkconfig --del spectrum
fi

%check
./spectrum_tests

%files
%defattr(-, root, root,-)
%doc spectrum.cfg.example AUTHORS ChangeLog TODO COPYING
%{python_sitelib}/spectrum*
%attr(755, root, root) %{_bindir}/spectrumctl
%{_sbindir}/spectrum
%{_datadir}/spectrum/
%{_initddir}/spectrum
%{_mandir}/man*/spectrum*
%attr(700, %{username}, %{groupname}) %{_localstatedir}/lib/spectrum/
%attr(700, %{username}, %{groupname}) %{_localstatedir}/run/spectrum/
%attr(700, %{username}, %{groupname}) %{_localstatedir}/log/spectrum/
%attr(750, root, %{groupname}) %dir %{_sysconfdir}/spectrum
%attr(640, root, %{groupname}) %config(noreplace) %{_sysconfdir}/spectrum/spectrum.cfg
%config(noreplace) %{_sysconfdir}/logrotate.d/spectrum

%changelog
* Thu Jun 17 2010 Matěj Cepl <mcepl at redhat.com> - 0.9.git20100614
- fix %% in %%changelog.

* Tue Jun 15 2010 Matěj Cepl <mcepl at redhat.com> - 0.8.git20100614
- Use %%global insted of %%define
- Preserve timestamps whenever possible
- Fix Requires and BuildRequires

* Mon Jun 14 2010 Matěj Cepl <mcepl at redhat.com> - 0.7.git20100614
- Even the later checkout which fixes missing function in glib on RHEL-5
- Adding missing Requires ... python-xmpp

* Sun Jun 13 2010 Matěj Cepl <mcepl at redhat.com> - 0.6.git20100613
- Merged to the latest upstream checkout, and removed
  unnecessary patches

* Sat Jun 12 2010 Matěj Cepl <mcepl at redhat.com> - 0.5.git20100526
- Another batch of reviewer's comments
- Add mschmidt at RH's new initscript

* Fri Jun 11 2010 Matěj Cepl <mcepl at redhat.com> - 0.4.git20100526
- file right bits fixed per reviewer's comments

* Fri Jun 11 2010 Matěj Cepl <mcepl at redhat.com> - 0.3.git20100526
- Err, of course, the same patch should be applied to Rawhide as well,
  it is not RHEL-5 exclusive.

* Fri Jun 11 2010 Matěj Cepl <mcepl at redhat.com> - 0.2.git20100526
- Finally managed to get a patch which makes spectrum building (wrong
  inline method hasAuthRequest).

* Tue Jun 08 2010 Matěj Cepl <mcepl at redhat.com> - 0.1.git20100526
- Fix release number and other objections from the package reviewer
- Use %%cmake and make VERBOSE=1 %%{?_smp_mflags} as we should
- Make a comment to the bug about reasons for not building for PPC
  on RHEL-5

* Fri Jun 04 2010 Matěj Cepl <mcepl at redhat.com> - 0.3-0.git20100526.1
- The later checkout from git
- Fix issues pointed out by package reviewer.

* Tue May 25 2010 Matěj Cepl <mcepl at redhat.com> - 0.2-5
- Do not use libgettextpo library anymore

* Tue May 25 2010 Matěj Cepl <mcepl at redhat.com> - 0.2-4
- move daemon binary to /usr/sbin

* Tue May 25 2010 Matěj Cepl <mcepl at redhat.com> - 0.2-3
- Make special spectrum user/group

* Tue May 18 2010 Matěj Cepl <mcepl at redhat.com> - 0.2-2
- make spectrum build on RHEL 5

* Thu Apr 01 2010 Matěj Cepl <mcepl at redhat.com> - 0.1-4
- Fix description and initscript location
- Fix %%{buildroot} and %%defattr

* Wed Mar 31 2010 Matěj Cepl <mcepl at redhat.com> - 0.1-3
- Fix requires and ownerships

* Tue Mar 30 2010 Matěj Cepl <mcepl at redhat.com> 0.1-2
- Attempt to make package building in koji with the latest gcc
- Fixing packaging issues

* Mon Feb 22 2010 Joost Ruijsch <joost at ruijsch.com>
- Created this SPEC file


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spectrum/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	21 Jun 2010 02:34:04 -0000	1.1
+++ .cvsignore	21 Jun 2010 08:48:20 -0000	1.2
@@ -0,0 +1 @@
+spectrum.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spectrum/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	21 Jun 2010 02:34:04 -0000	1.1
+++ sources	21 Jun 2010 08:48:20 -0000	1.2
@@ -0,0 +1 @@
+82e0a27dfbe0b1acb9856e3c50740a24  spectrum.tar.bz2

