rpms/rapidsvn/devel rapidsvn-0.9.1-gcc41.patch, NONE, 1.1 rapidsvn.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Tim Jackson (timj) fedora-extras-commits at redhat.com
Thu May 4 21:48:05 UTC 2006


Author: timj

Update of /cvs/extras/rpms/rapidsvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5812/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rapidsvn-0.9.1-gcc41.patch rapidsvn.spec 
Log Message:
auto-import rapidsvn-0.9.1-3 on branch devel from rapidsvn-0.9.1-3.src.rpm

rapidsvn-0.9.1-gcc41.patch:

--- NEW FILE rapidsvn-0.9.1-gcc41.patch ---
--- rapidsvn-0.9.1/src/action.hpp	2006-02-14 15:30:20.000000000 +0100
+++ rapidsvn-0.9.1-edited/src/action.hpp	2006-04-03 23:24:33.000000000 +0200
@@ -300,7 +300,7 @@
     * @return temporary filename
     */
   svn::Path
-  Action::GetPathAsTempFile (
+  GetPathAsTempFile (
     const svn::Path & path,
     const svn::Revision & revision = svn::Revision::HEAD);
 
--- rapidsvn-0.9.1/src/rapidsvn_frame.hpp	2006-02-14 15:30:20.000000000 +0100
+++ rapidsvn-0.9.1-edited/src/rapidsvn_frame.hpp	2006-04-03 23:28:22.000000000 +0200
@@ -161,7 +161,7 @@
 
   // Enable/disable action menu items
   bool
-  RapidSvnFrame::ValidateIDActionFlags (int id, unsigned int selectionActionFlags);
+  ValidateIDActionFlags (int id, unsigned int selectionActionFlags);
   void OnUpdateCommand (wxUpdateUIEvent & updateUIEvent);
 
   const svn::Targets
--- rapidsvn-0.9.1/src/preferences_dlg.cpp	2006-02-14 15:30:20.000000000 +0100
+++ rapidsvn-0.9.1-edited/src/preferences_dlg.cpp	2006-04-03 23:30:23.000000000 +0200
@@ -95,7 +95,7 @@
 {
 public:
 
-  ProgramsPanel::ProgramsPanel (wxWindow* parent, Preferences * prefs)
+  ProgramsPanel (wxWindow* parent, Preferences * prefs)
     : wxPanel (parent), m_prefs (prefs)
   {
     InitializeData ();


--- NEW FILE rapidsvn.spec ---
Name:           rapidsvn
Version:        0.9.1
Release:        3%{?dist}
Summary:        Graphical interface for the Subversion revision control system

Group:          Development/Tools
License:        GPL
URL:            http://www.rapidsvn.org/
Source0:        http://rapidsvn.org/download/rapidsvn-%{version}.tar.gz
Patch0:		rapidsvn-0.9.1-gcc41.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  apr-devel, apr-util-devel, neon-devel
BuildRequires:  libtool >= 1.4.2

# For doc generation; rapidsvn needs the "dot" tool from graphviz
BuildRequires:  docbook-style-xsl >= 1.58.1, doxygen, libxslt >= 1.0.27
BuildRequires:  graphviz

BuildRequires:  wxGTK-devel >= 2.4.2
BuildRequires:  desktop-file-utils

%description
RapidSVN is a GUI front-end for the Subversion revision control system. It
allows access to most of the features of Subversion through a user-friendly
interface.

%package -n svncpp
Summary:        C++ bindings for the Subversion client library
Group:          Development/Libraries
License:        LGPL
BuildRequires:  subversion-devel
# for test framework
BuildRequires:  cppunit-devel
Requires:       subversion
Requires(pre):  /sbin/ldconfig
Requires(post): /sbin/ldconfig

%description -n svncpp
svncpp is a C++ wrapper for the C Subversion client library which abstracts
many parts of the C API and provides an object-oriented programming interface.

%package -n svncpp-devel
Summary:        Development resources for the 'svncpp' library
Group:          Development/Libraries
License:        LGPL
Requires:       svncpp = %{version}-%{release}

%description -n svncpp-devel
Development resources for the 'svncpp' C++ client library for Subversion.
Install this package if you need to compile an application that requires the
'svncpp' library.

%prep
%setup -q
%patch0 -p1

%{__cat} <<EOF >rapidsvn.desktop
[Desktop Entry]
Encoding=UTF-8
Name=RapidSVN
GenericName=Subversion client
Comment=Manage Subversion repositories
Exec=rapidsvn
Icon=rapidsvn.png
Terminal=false
Type=Application
Categories=Application;Development;GNOME;
Version=0.9.4
EOF

%build
%configure \
        --disable-static \
        --disable-no-exceptions \
        --with-svn-lib=%{_libdir} \
        --with-apu-config=%{_bindir}/apu-1-config \
        --with-apr-config=%{_bindir}/apr-1-config \
        --with-docbook-xsl-manpages=%{_datadir}/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl

make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool

pushd doc/manpage
iconv --from-code ISO-8859-1 --to-code UTF-8 --output rapidsvn.1.utf8 rapidsvn.1
mv rapidsvn.1.utf8 rapidsvn.1
popd

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

# Install desktop file and icon
%{__install} -D -m 644 src/res/bitmaps/svn.xpm %{buildroot}%{_datadir}/pixmaps/rapidsvn.xpm
%{__install} -d -m 755 %{buildroot}%{_datadir}/applications/
desktop-file-install --vendor fedora               \
        --add-category X-Fedora                    \
        --dir %{buildroot}%{_datadir}/applications \
        rapidsvn.desktop

# Install manpage
%{__install} -D -m 644 doc/manpage/rapidsvn.1 %{buildroot}%{_mandir}/man1/rapidsvn.1

# Remove libtool stuff
rm -f %{buildroot}%{_libdir}/libsvncpp.{a,la}

%check -n svncpp
pushd src/tests/svncpp
make
./svncpptest | grep OK
if [ $? != 0 ]; then
	echo "svncpp tests failed"
	exit 5
fi

%clean
rm -rf %{buildroot}

%post -n svncpp -p /sbin/ldconfig
%postun -n svncpp -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS CHANGES FDL.txt GPL.txt LICENSE.txt README
%{_bindir}/rapidsvn
%{_datadir}/applications/fedora-rapidsvn.desktop
%{_datadir}/pixmaps/rapidsvn.xpm
%{_mandir}/man1/*

%files -n svncpp
%doc LGPL.txt
%{_libdir}/libsvncpp.so.*

%files -n svncpp-devel
%doc LGPL.txt doc/svncpp/html
%{_includedir}/svncpp/
%{_libdir}/libsvncpp.so

%changelog
* Wed May 03 2006 Tim Jackson <rpm at timj.co.uk> 0.9.1-3
- libtool hack to fix RPATH issue

* Sat Apr 29 2006 Tim Jackson <rpm at timj.co.uk> 0.9.1-2
- Update list of docs inc. add GPL, LGPL docs and LICENSE.txt
- Remove autoconf from BR
- Fix manpage generation and add manpage to package
- Add graphviz BR for correct doc generation
- Add --disable-no-exceptions per README
- Use --disable-static since we don't use the static libs
- Spin off svncpp and svncpp-devel subpackages
- svncpp has ldconfig in post/postun
- Add --with-svn-lib which should fix build on x86_64
- Add %check section using package's inbuilt tests (requires cppunit)

* Thu Apr 27 2006 Tim Jackson <rpm at timj.co.uk> 0.9.1-1
- Initial package for Fedora Extras; based originally on an old DAG spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rapidsvn/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 May 2006 21:46:57 -0000	1.1
+++ .cvsignore	4 May 2006 21:48:05 -0000	1.2
@@ -0,0 +1 @@
+rapidsvn-0.9.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rapidsvn/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 May 2006 21:46:57 -0000	1.1
+++ sources	4 May 2006 21:48:05 -0000	1.2
@@ -0,0 +1 @@
+ba03034db35912c7b51b146cc7e6090e  rapidsvn-0.9.1.tar.gz




More information about the fedora-extras-commits mailing list