libraries/mrw-cxx
1
0
Fork 0
Code Issues Releases Activity

rpmbuild should work now; refs #2

Browse Source
This commit is contained in:
Marc Wäckerlin
2012-07-10 12:39:47 +00:00
parent fe097e695a
commit f0cd5dbdd9
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@@ -264,7 +264,7 @@ AM_CONDITIONAL(MINGW32, test "$MINGW32" = "yes")
AM_CONDITIONAL(MAC, test "$MAC" = "yes") AM_CONDITIONAL(MAC, test "$MAC" = "yes")
# export macros # export macros
RPMBUILD=${BUILD_NUMBER} RPMBUILD=${BUILD_NUMBER:-1}
AC_SUBST(RPMBUILD) AC_SUBST(RPMBUILD)
SRCDIR=${srcdir} SRCDIR=${srcdir}
AC_SUBST(SRCDIR) AC_SUBST(SRCDIR)

4
doc/examples/makefile.am
View File

@@ -3,7 +3,9 @@
## 1 2 3 4 5 6 7 8 ## 1 2 3 4 5 6 7 8
## 45678901234567890123456789012345678901234567890123456789012345678901234567890 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
noinst_PROGRAMS = exceptionhandling smartpointer exampledir = ${docdir}/examples
example_PROGRAMS = exceptionhandling smartpointer
example_DATA = ${smartpointer_SOURCES} ${exceptionhandling_SOURCES}
exceptionhandling_SOURCES = exceptionhandling.cxx exceptionhandling_SOURCES = exceptionhandling.cxx
exceptionhandling_CPPFLAGS = -I${top_srcdir}/src exceptionhandling_CPPFLAGS = -I${top_srcdir}/src

11
makefile.am
View File

@@ -13,7 +13,7 @@
SUBDIRS = @SRC_DIR@ @TST_DIR@ @DOC_DIR@ SUBDIRS = @SRC_DIR@ @TST_DIR@ @DOC_DIR@
nobase_include_HEADERS = doc_DATA = AUTHORS COPYING ChangeLog NEWS README INSTALL
EXTRA_DIST = bootstrap.sh debian EXTRA_DIST = bootstrap.sh debian
@@ -37,9 +37,10 @@ RPMS = /usr/src/packages/RPMS/i586/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.i586.
release: tag webserver release: tag webserver
rpm: dist rpm: dist
cp @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.tar.gz \ rpmbuild -ba \
/usr/src/packages/SOURCES/ --define "_topdir $$(pwd)" \
rpmbuild -ba --clean @PACKAGENAME@.spec --define "_sourcedir $$(pwd)" \
@PACKAGENAME@.spec
deps = ${top_srcdir}/COPYING ${top_srcdir}/README ${top_srcdir}/INSTALL ${top_srcdir}/NEWS ${top_srcdir}/ChangeLog deps = ${top_srcdir}/COPYING ${top_srcdir}/README ${top_srcdir}/INSTALL ${top_srcdir}/NEWS ${top_srcdir}/ChangeLog
@@ -59,4 +60,4 @@ distclean-local:
- rm -r autom4te.cache - rm -r autom4te.cache
- rm aclocal.m4 config.guess config.sub configure \ - rm aclocal.m4 config.guess config.sub configure \
depcomp install-sh ltmain.sh makefile makefile.in \ depcomp install-sh ltmain.sh makefile makefile.in \
missing mkinstalldirs missing mkinstalldirs SPECS RPMS BUILD BUILDROOT SRPMS

12
mrw-c++.spec.in
View File

@@ -40,9 +40,9 @@ This package contains only the shared libraries required at runtime.
%prep %prep
%setup -q %setup -q
CXXFLAGS="-O3" ./configure --prefix=/usr \ CXXFLAGS="-O3" ./configure --prefix=/usr \
--datadir=/usr/share/doc/packages \ --libdir=/usr/%_lib \
--enable-doxygen \ --docdir=/usr/share/doc/packages/@PACKAGENAME@ \
--libdir=/usr/%_lib --enable-doxygen
%build %build
make make
@@ -56,6 +56,8 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
/usr/%_lib/*.so.* /usr/%_lib/*.so.*
/usr/share/pkgconfig
/usr/lib64/pkgconfig
%doc %doc
/usr/share/doc/packages/@PACKAGENAME@/AUTHORS /usr/share/doc/packages/@PACKAGENAME@/AUTHORS
/usr/share/doc/packages/@PACKAGENAME@/COPYING /usr/share/doc/packages/@PACKAGENAME@/COPYING
@@ -78,10 +80,10 @@ This Package contains all files required for developement.
%defattr(-,root,root,-) %defattr(-,root,root,-)
/usr/%_lib/*.so /usr/%_lib/*.so
/usr/%_lib/*.a /usr/%_lib/*.a
/usr/lib/*.la /usr/%_lib/*.la
/usr/include /usr/include
/usr/share/doc/packages/@PACKAGENAME@/examples /usr/share/doc/packages/@PACKAGENAME@/examples
/usr/share/doc/packages/@PACKAGENAME@/doc /usr/share/doc/packages/@PACKAGENAME@/html
/usr/share/doc/packages/@PACKAGENAME@/@PACKAGENAME@.spec /usr/share/doc/packages/@PACKAGENAME@/@PACKAGENAME@.spec
/usr/share/doc/packages/@PACKAGENAME@/INSTALL /usr/share/doc/packages/@PACKAGENAME@/INSTALL