rpms/spectrum/F-13 .cvsignore, 1.2, 1.3 sources, 1.3, 1.4 spectrum-0.3-cmake.patch, 1.1, 1.2 spectrum.spec, 1.2, 1.3

Matej Cepl mcepl at fedoraproject.org
Tue Jul 13 19:28:18 UTC 2010


Author: mcepl

Update of /cvs/pkgs/rpms/spectrum/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25763

Modified Files:
	.cvsignore sources spectrum-0.3-cmake.patch spectrum.spec 
Log Message:
New upstream release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spectrum/F-13/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Jun 2010 11:22:24 -0000	1.2
+++ .cvsignore	13 Jul 2010 19:28:17 -0000	1.3
@@ -1 +1 @@
-spectrum.tar.bz2
+spectrum-0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spectrum/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	29 Jun 2010 12:42:22 -0000	1.3
+++ sources	13 Jul 2010 19:28:18 -0000	1.4
@@ -1 +1 @@
-65a7b11b87ce7530e6136efbf3c9cdb6  spectrum.tar.bz2
+476d94a73b37b9e5e330565b838cbca6  spectrum-0.3.tar.gz

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

Index: spectrum-0.3-cmake.patch
===================================================================
RCS file: /cvs/pkgs/rpms/spectrum/F-13/spectrum-0.3-cmake.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- spectrum-0.3-cmake.patch	21 Jun 2010 11:22:24 -0000	1.1
+++ spectrum-0.3-cmake.patch	13 Jul 2010 19:28:18 -0000	1.2
@@ -1,6 +1,6 @@
 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
+--- spectrum/CMakeLists.txt.RH-build	2010-07-13 09:08:56.000000000 +0200
++++ spectrum/CMakeLists.txt	2010-07-13 10:23:52.000000000 +0200
 @@ -1,6 +1,6 @@
  project(spectrum)
   
@@ -9,7 +9,7 @@ diff -up spectrum/CMakeLists.txt.RH-buil
  if(COMMAND cmake_policy)
  	cmake_policy(SET CMP0003 NEW)
  endif(COMMAND cmake_policy)
-@@ -190,9 +190,9 @@ set(spectrum_MOC_HDRS
+@@ -192,9 +192,9 @@ set(spectrum_MOC_HDRS
  add_executable(spectrum ${spectrum_SRCS} ${lrelease_outputs})
  
  if(DEFINED WITH_STATIC_GLOOX)
@@ -21,7 +21,7 @@ diff -up spectrum/CMakeLists.txt.RH-buil
  endif(DEFINED WITH_STATIC_GLOOX)
  
  message(STATUS "Transport will be installed into: " ${CMAKE_INSTALL_PREFIX})
-@@ -333,30 +333,6 @@ ELSE(NOT GETTEXT_MSGFMT_EXECUTABLE)
+@@ -336,30 +336,6 @@ ELSE(NOT GETTEXT_MSGFMT_EXECUTABLE)
   
          ADD_CUSTOM_TARGET(translations ALL)
   
@@ -38,7 +38,7 @@ diff -up spectrum/CMakeLists.txt.RH-buil
 -                        SET(_gmoFile ${CMAKE_CURRENT_SOURCE_DIR}/po/${_lang}.mo)
 - 
 -                        ADD_CUSTOM_COMMAND(TARGET translations
--                                COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --check -o ${_gmoFile} ${_poFile}
+-                                COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_poFile}
 -                                DEPENDS ${_poFile})
 -
 -                        ADD_CUSTOM_COMMAND(TARGET xgettext
@@ -51,10 +51,10 @@ diff -up spectrum/CMakeLists.txt.RH-buil
 - 
  ENDIF(NOT GETTEXT_MSGFMT_EXECUTABLE)
  
- 
+ ADD_CUSTOM_TARGET (man ALL python ${CMAKE_CURRENT_SOURCE_DIR}/spectrumctl/make_man_page.py > ${CMAKE_CURRENT_SOURCE_DIR}/man/spectrumctl.8)
 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
+--- /dev/null	2010-07-12 19:13:50.734841243 +0200
++++ spectrum/cmake_modules/FindPackageHandleStandardArgs.cmake	2010-07-13 09:27:07.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.


Index: spectrum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spectrum/F-13/spectrum.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- spectrum.spec	29 Jun 2010 12:42:23 -0000	1.2
+++ spectrum.spec	13 Jul 2010 19:28:18 -0000	1.3
@@ -7,13 +7,14 @@
 Summary: XMPP transport/gateway
 Name: spectrum
 Version: 0.3
-Release: 0.10.git20100629%{?dist}
+Release: 1%{?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
+#Source0: %{name}.tar.bz2
+Source0: http://spectrum.im/attachments/download/5/spectrum-%{version}.tar.gz
 # Patch to make spectrum build with an obsolete cmake on RHEL-5
 Patch1: spectrum-%{version}-cmake.patch
 URL: http://spectrum.im/
@@ -24,6 +25,7 @@ BuildRequires: gloox-devel
 BuildRequires: cppunit-devel
 BuildRequires: cmake
 BuildRequires: python2-devel
+BuildRequires: python-xmpp
 Requires: logrotate
 Requires: python-xmpp
 Requires(pre): shadow-utils
@@ -45,7 +47,7 @@ switched on in order to get libpurple.
 %endif
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
 %if 0%{?rhel} <= 5 && 0%{?fedora} < 7
 %patch1 -p1 -b .RH-build
@@ -71,26 +73,19 @@ EOS
 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
+    %{buildroot}%{_datadir}/spectrum/schemas/sqlite_schema.sql
 install -p -D -m 644 schemas/mysql_schema.sql \
-	%{buildroot}%{_datadir}/spectrum/schemas/mysql_schema.sql
+    %{buildroot}%{_datadir}/spectrum/schemas/mysql_schema.sql
 install -p -D -m 755 initscripts/fedora/spectrum \
-	%{buildroot}%{_initddir}/spectrum
+    %{buildroot}%{_initddir}/spectrum
 install -p -D -m 644 spectrum-logrotate \
-	%{buildroot}%{_sysconfdir}/logrotate.d/spectrum
+    %{buildroot}%{_sysconfdir}/logrotate.d/spectrum
 
 install -d %{buildroot}%{_localstatedir}/{lib,run,log}/spectrum
 
@@ -98,8 +93,11 @@ install -d %{buildroot}%{_localstatedir}
 install -d %{buildroot}%{_sbindir}
 mv %{buildroot}%{_bindir}/spectrum %{buildroot}%{_sbindir}
 
-# move spectrum.cfg.example
-mv %{buildroot}%{_docdir}/spectrum/spectrum.cfg.example .
+# Move %{_defaultdocdir}/spectrum/spectrum.cfg.example back
+mv %{buildroot}%{_defaultdocdir}/spectrum/spectrum.cfg.example .
+
+# Create a %{_sysconfdir}/spectrum directory to have something to own ;)
+install -d -m 750 %{buildroot}%{_sysconfdir}/spectrum
 
 %clean
 rm -rf %{buildroot}
@@ -137,10 +135,19 @@ fi
 %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
+* Tue Jul 13 2010 Matěj Cepl <mcepl at redhat.com> - 0.3-1
+- New upstream release.
+
+* Tue Jul 13 2010 Matěj Cepl <mcepl at redhat.com> - 0.3-0.12.git20100712
+- New upstream checkout, fixed compiler warnings.
+
+* Mon Jul 12 2010 Matěj Cepl <mcepl at redhat.com> - 0.3-0.11.git20100712
+- New upstream checkout, preparation for 0.3 release.
+- Fix location of spectrum.cfg example.
+
 * Tue Jun 29 2010 Matěj Cepl <mcepl at redhat.com> - 0.10.git20100629
 - New pull from the upstream git
 



More information about the scm-commits mailing list