rpms/NetworkManager-pptp/EL-5 NetworkManager-pptp-0.6.4-noversion.patch, NONE, 1.1 NetworkManager-pptp-0.6.4-pppdplugin.patch, NONE, 1.1 NetworkManager-pptp-0.6.6-desktop.patch, NONE, 1.1 NetworkManager-pptp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Lubomir Kundrak (lkundrak)
fedora-extras-commits at redhat.com
Fri Apr 25 15:36:54 UTC 2008
Author: lkundrak
Update of /cvs/pkgs/rpms/NetworkManager-pptp/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11543/EL-5
Modified Files:
.cvsignore sources
Added Files:
NetworkManager-pptp-0.6.4-noversion.patch
NetworkManager-pptp-0.6.4-pppdplugin.patch
NetworkManager-pptp-0.6.6-desktop.patch
NetworkManager-pptp.spec
Log Message:
Initial import
NetworkManager-pptp-0.6.4-noversion.patch:
--- NEW FILE NetworkManager-pptp-0.6.4-noversion.patch ---
So that we don't get so.0 and so.0.0 files:
diff -urp NetworkManager-pptp-0.6.4.orig/properties/Makefile.am NetworkManager-pptp-0.6.4/properties/Makefile.am
--- NetworkManager-pptp-0.6.4.orig/properties/Makefile.am 2008-04-20 22:47:04.000000000 +0200
+++ NetworkManager-pptp-0.6.4/properties/Makefile.am 2008-04-24 22:40:33.000000000 +0200
@@ -27,6 +27,9 @@ libnm_pptp_properties_la_LIBADD =
$(GCONF_LIBS) \
$(LIBGNOMEUI_LIBS)
+libnm_pptp_properties_la_LDFLAGS = \
+ -avoid-version
+
CLEANFILES = *.bak *.gladep *~
EXTRA_DIST = \
diff -urp NetworkManager-pptp-0.6.4.orig/properties/Makefile.in NetworkManager-pptp-0.6.4/properties/Makefile.in
--- NetworkManager-pptp-0.6.4.orig/properties/Makefile.in 2008-04-24 22:36:38.000000000 +0200
+++ NetworkManager-pptp-0.6.4/properties/Makefile.in 2008-04-24 22:40:53.000000000 +0200
@@ -62,8 +62,8 @@ libnm_pptp_properties_la_OBJECTS = \
$(am_libnm_pptp_properties_la_OBJECTS)
libnm_pptp_properties_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(libnm_pptp_properties_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ $(libnm_pptp_properties_la_CFLAGS) $(CFLAGS) \
+ $(libnm_pptp_properties_la_LDFLAGS) $(LDFLAGS) -o $@
DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -283,6 +283,9 @@ libnm_pptp_properties_la_LIBADD = \
$(GCONF_LIBS) \
$(LIBGNOMEUI_LIBS)
+libnm_pptp_properties_la_LDFLAGS = \
+ -avoid-version
+
CLEANFILES = *.bak *.gladep *~
EXTRA_DIST = \
$(glade_DATA)
NetworkManager-pptp-0.6.4-pppdplugin.patch:
--- NEW FILE NetworkManager-pptp-0.6.4-pppdplugin.patch ---
Moves the pppd plugin to lib/pppd from bin.
Contains autogenerated bits, as it is not possible to regenerate those on RHEL
due to the fact that right autoconf version is missing.
diff -urp NetworkManager-pptp-0.6.4.orig/auth-dialog/Makefile.in NetworkManager-pptp-0.6.4/auth-dialog/Makefile.in
--- NetworkManager-pptp-0.6.4.orig/auth-dialog/Makefile.in 2008-04-23 15:23:32.000000000 +0200
+++ NetworkManager-pptp-0.6.4/auth-dialog/Makefile.in 2008-04-23 15:22:00.000000000 +0200
@@ -182,6 +182,7 @@ POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PPPD_VERSION = @PPPD_VERSION@
RANLIB = @RANLIB@
SBINDIR = @SBINDIR@
SED = @SED@
diff -urp NetworkManager-pptp-0.6.4.orig/autom4te.cache/output.0 NetworkManager-pptp-0.6.4/autom4te.cache/output.0
--- NetworkManager-pptp-0.6.4.orig/autom4te.cache/output.0 2008-04-23 15:23:29.000000000 +0200
+++ NetworkManager-pptp-0.6.4/autom4te.cache/output.0 2008-04-23 15:21:57.000000000 +0200
@@ -941,6 +941,7 @@ BINDIR
SBINDIR
LIBDIR
LIBEXECDIR
+PPPD_VERSION
LTLIBOBJS'
ac_subst_files=''
ac_precious_vars='build_alias
@@ -23696,6 +23697,14 @@ else
echo "${ECHO_T}no" >&6; }
fi
+PPPD_VERSION=`/usr/sbin/pppd --version 2>&1 | awk '{print $3}'`
+if test "z$PPPD_VERSION" = "z"; then
+ { { echo "$as_me:$LINENO: error: Couldn't determine the version of your pppd package." >&5
+echo "$as_me: error: Couldn't determine the version of your pppd package." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
ac_config_files="$ac_config_files Makefile src/Makefile auth-dialog/Makefile properties/Makefile po/Makefile.in nm-pptp-service.name"
cat >confcache <<\_ACEOF
@@ -24584,10 +24593,11 @@ BINDIR!$BINDIR$ac_delim
SBINDIR!$SBINDIR$ac_delim
LIBDIR!$LIBDIR$ac_delim
LIBEXECDIR!$LIBEXECDIR$ac_delim
+PPPD_VERSION!$PPPD_VERSION$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -urp NetworkManager-pptp-0.6.4.orig/configure NetworkManager-pptp-0.6.4/configure
--- NetworkManager-pptp-0.6.4.orig/configure 2008-04-23 15:23:31.000000000 +0200
+++ NetworkManager-pptp-0.6.4/configure 2008-04-23 15:21:59.000000000 +0200
@@ -941,6 +941,7 @@ BINDIR
SBINDIR
LIBDIR
LIBEXECDIR
+PPPD_VERSION
LTLIBOBJS'
ac_subst_files=''
ac_precious_vars='build_alias
@@ -4664,7 +4665,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4667 "configure"' > conftest.$ac_ext
+ echo '#line 4668 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7407,11 +7408,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7410: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7411: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7414: \$? = $ac_status" >&5
+ echo "$as_me:7415: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7697,11 +7698,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7700: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7701: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7704: \$? = $ac_status" >&5
+ echo "$as_me:7705: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7801,11 +7802,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7804: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7805: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7808: \$? = $ac_status" >&5
+ echo "$as_me:7809: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10152,7 +10153,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10155 "configure"
+#line 10156 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10252,7 +10253,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10255 "configure"
+#line 10256 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12672,11 +12673,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12675: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12676: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12679: \$? = $ac_status" >&5
+ echo "$as_me:12680: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12776,11 +12777,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12779: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12780: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12783: \$? = $ac_status" >&5
+ echo "$as_me:12784: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14340,11 +14341,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14343: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14344: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14347: \$? = $ac_status" >&5
+ echo "$as_me:14348: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14444,11 +14445,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14447: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14448: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14451: \$? = $ac_status" >&5
+ echo "$as_me:14452: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16633,11 +16634,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16636: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16637: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16640: \$? = $ac_status" >&5
+ echo "$as_me:16641: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16923,11 +16924,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16926: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16927: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16930: \$? = $ac_status" >&5
+ echo "$as_me:16931: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17027,11 +17028,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17030: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17031: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17034: \$? = $ac_status" >&5
+ echo "$as_me:17035: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -23684,6 +23685,14 @@ else
echo "${ECHO_T}no" >&6; }
fi
+PPPD_VERSION=`/usr/sbin/pppd --version 2>&1 | awk '{print $3}'`
+if test "z$PPPD_VERSION" = "z"; then
+ { { echo "$as_me:$LINENO: error: Couldn't determine the version of your pppd package." >&5
+echo "$as_me: error: Couldn't determine the version of your pppd package." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
ac_config_files="$ac_config_files Makefile src/Makefile auth-dialog/Makefile properties/Makefile po/Makefile.in nm-pptp-service.name"
cat >confcache <<\_ACEOF
@@ -24572,10 +24581,11 @@ BINDIR!$BINDIR$ac_delim
SBINDIR!$SBINDIR$ac_delim
LIBDIR!$LIBDIR$ac_delim
LIBEXECDIR!$LIBEXECDIR$ac_delim
+PPPD_VERSION!$PPPD_VERSION$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -urp NetworkManager-pptp-0.6.4.orig/configure.in NetworkManager-pptp-0.6.4/configure.in
--- NetworkManager-pptp-0.6.4.orig/configure.in 2008-04-23 15:20:24.000000000 +0200
+++ NetworkManager-pptp-0.6.4/configure.in 2008-04-23 15:21:46.000000000 +0200
@@ -122,6 +122,12 @@ else
AC_MSG_RESULT(no)
fi
+PPPD_VERSION=`/usr/sbin/pppd --version 2>&1 | awk '{print $3}'`
+if test "z$PPPD_VERSION" = "z"; then
+ AC_MSG_ERROR(Couldn't determine the version of your pppd package.)
+fi
+AC_SUBST([PPPD_VERSION])
+
AC_OUTPUT([
Makefile
src/Makefile
diff -urp NetworkManager-pptp-0.6.4.orig/Makefile.in NetworkManager-pptp-0.6.4/Makefile.in
--- NetworkManager-pptp-0.6.4.orig/Makefile.in 2008-04-23 15:23:32.000000000 +0200
+++ NetworkManager-pptp-0.6.4/Makefile.in 2008-04-23 15:22:00.000000000 +0200
@@ -201,6 +201,7 @@ POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PPPD_VERSION = @PPPD_VERSION@
RANLIB = @RANLIB@
SBINDIR = @SBINDIR@
SED = @SED@
diff -urp NetworkManager-pptp-0.6.4.orig/properties/Makefile.in NetworkManager-pptp-0.6.4/properties/Makefile.in
--- NetworkManager-pptp-0.6.4.orig/properties/Makefile.in 2008-04-23 15:23:32.000000000 +0200
+++ NetworkManager-pptp-0.6.4/properties/Makefile.in 2008-04-23 15:22:00.000000000 +0200
@@ -196,6 +196,7 @@ POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PPPD_VERSION = @PPPD_VERSION@
RANLIB = @RANLIB@
SBINDIR = @SBINDIR@
SED = @SED@
diff -urp NetworkManager-pptp-0.6.4.orig/src/Makefile.am NetworkManager-pptp-0.6.4/src/Makefile.am
--- NetworkManager-pptp-0.6.4.orig/src/Makefile.am 2008-04-23 15:20:24.000000000 +0200
+++ NetworkManager-pptp-0.6.4/src/Makefile.am 2008-04-23 15:21:46.000000000 +0200
@@ -13,9 +13,13 @@ AM_CPPFLAGS = \
-DLIBDIR=\""$(libdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \
-DLOCALSTATEDIR=\""$(localstatedir)"\" \
- -DDATADIR=\"$(datadir)\"
+ -DDATADIR=\"$(datadir)\" \
+ -fPIC
-bin_PROGRAMS = nm-pptp-service nm-pptp-service-pppd-plugin.so
+bin_PROGRAMS = nm-pptp-service
+
+pppdplugindir = $(libdir)/pppd/$(PPPD_VERSION)
+pppdplugin_PROGRAMS = nm-pptp-service-pppd-plugin.so
nm_pptp_service_SOURCES = \
nm-pptp-service.c \
diff -urp NetworkManager-pptp-0.6.4.orig/src/Makefile.in NetworkManager-pptp-0.6.4/src/Makefile.in
--- NetworkManager-pptp-0.6.4.orig/src/Makefile.in 2008-04-23 15:23:32.000000000 +0200
+++ NetworkManager-pptp-0.6.4/src/Makefile.in 2008-04-23 15:22:00.000000000 +0200
@@ -32,8 +32,8 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-bin_PROGRAMS = nm-pptp-service$(EXEEXT) \
- nm-pptp-service-pppd-plugin.so$(EXEEXT)
+bin_PROGRAMS = nm-pptp-service$(EXEEXT)
+pppdplugin_PROGRAMS = nm-pptp-service-pppd-plugin.so$(EXEEXT)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -44,9 +44,10 @@ am__configure_deps = $(am__aclocal_m4_de
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pppdplugindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
+pppdpluginPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS) $(pppdplugin_PROGRAMS)
am_nm_pptp_service_OBJECTS = nm-pptp-service.$(OBJEXT) \
nm-utils.$(OBJEXT)
nm_pptp_service_OBJECTS = $(am_nm_pptp_service_OBJECTS)
@@ -195,6 +196,7 @@ POFILES = @POFILES@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PPPD_VERSION = @PPPD_VERSION@
RANLIB = @RANLIB@
SBINDIR = @SBINDIR@
SED = @SED@
@@ -270,8 +272,10 @@ AM_CPPFLAGS = \
-DLIBDIR=\""$(libdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \
-DLOCALSTATEDIR=\""$(localstatedir)"\" \
- -DDATADIR=\"$(datadir)\"
+ -DDATADIR=\"$(datadir)\" \
+ -fPIC
+pppdplugindir = $(libdir)/pppd/$(PPPD_VERSION)
nm_pptp_service_SOURCES = \
nm-pptp-service.c \
nm-pptp-service.h \
@@ -358,6 +362,34 @@ clean-binPROGRAMS:
echo " rm -f $$p $$f"; \
rm -f $$p $$f ; \
done
+install-pppdpluginPROGRAMS: $(pppdplugin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ test -z "$(pppdplugindir)" || $(MKDIR_P) "$(DESTDIR)$(pppdplugindir)"
+ @list='$(pppdplugin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ || test -f $$p1 \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(pppdpluginPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(pppdplugindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(pppdpluginPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(pppdplugindir)/$$f" || exit 1; \
+ else :; fi; \
+ done
+
+uninstall-pppdpluginPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pppdplugin_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+ echo " rm -f '$(DESTDIR)$(pppdplugindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pppdplugindir)/$$f"; \
+ done
+
+clean-pppdpluginPROGRAMS:
+ @list='$(pppdplugin_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
nm-pptp-service$(EXEEXT): $(nm_pptp_service_OBJECTS) $(nm_pptp_service_DEPENDENCIES)
@rm -f nm-pptp-service$(EXEEXT)
$(LINK) $(nm_pptp_service_OBJECTS) $(nm_pptp_service_LDADD) $(LIBS)
@@ -483,7 +515,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS)
installdirs:
- for dir in "$(DESTDIR)$(bindir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pppdplugindir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -513,7 +545,8 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
+ clean-pppdpluginPROGRAMS mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -531,7 +564,7 @@ info: info-am
info-am:
-install-data-am:
+install-data-am: install-pppdpluginPROGRAMS
install-dvi: install-dvi-am
@@ -567,23 +600,25 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am: uninstall-binPROGRAMS uninstall-pppdpluginPROGRAMS
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- clean-generic clean-libtool ctags distclean distclean-compile \
- distclean-generic distclean-libtool distclean-tags distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-binPROGRAMS install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-binPROGRAMS
+ clean-generic clean-libtool clean-pppdpluginPROGRAMS ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-pppdpluginPROGRAMS install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-binPROGRAMS \
+ uninstall-pppdpluginPROGRAMS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
NetworkManager-pptp-0.6.6-desktop.patch:
--- NEW FILE NetworkManager-pptp-0.6.6-desktop.patch ---
Fix desktop-file-validate warnings.
--- nm-pptp.desktop.in.orig 2008-04-20 22:06:47.000000000 +0200
+++ nm-pptp.desktop.in 2008-04-20 22:07:06.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
_Name=VPN Connection Manager (PPTP)
_GenericName=VPN Connection Manager (PPTP)
_Comment=Add, Remove, and Edit VPN Connections
@@ -7,6 +6,5 @@ Exec=nm-vpn-properties --import-service
Icon=gnome-mime-application-x-pptp-settings
Terminal=false
Type=Application
-DocPath=
-Categories=GNOME;Application;Network;
-MimeType=application/x-pptp-settings
+Categories=GNOME;Network;
+MimeType=application/x-pptp-settings;
--- NEW FILE NetworkManager-pptp.spec ---
%define ppp_version %(%{_sbindir}/pppd --version 2>&1 |awk '{print $3}')
Name: NetworkManager-pptp
Version: 0.6.4
Release: 2%{?dist}
Summary: PPTP support for NetworkManager
# How to build the source tarball:
# NAME=%{name}
# VERSION=%{version}
# svn co http://svn.gnome.org/svn/NetworkManager/tags/NETWORKMANAGER_0_6_4_RELEASE/vpn-daemons/pptp/ \
# $NAME-$VERSION
# cd $NAME-$VERSION
# ./autogen.sh
# make distclean
# cd ..
# tar --exclude .svn -czf $NAME-$VERSION.tar.gz $NAME-$VERSION
Group: System Environment/Base
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
Source0: %{name}-%{version}.tar.gz
Patch0: NetworkManager-pptp-0.6.6-desktop.patch
Patch1: NetworkManager-pptp-0.6.4-pppdplugin.patch
Patch2: NetworkManager-pptp-0.6.4-noversion.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: NetworkManager-devel = 1:%{version}
BuildRequires: libgnomeui-devel
BuildRequires: gettext intltool
BuildRequires: desktop-file-utils
BuildRequires: ppp
Requires: NetworkManager = 1:%{version}
# Installs plugin to version-specific directory
Requires: ppp = %{ppp_version}
Requires: pptp
%description
This package contains software for integrating PPTP VPN support with
the NetworkManager and the GNOME desktop.
%prep
%setup -q
%patch0 -p0 -b .desktop
%patch1 -p1 -b .pppdplugin
%patch2 -p1 -b .noversion
%build
%configure --disable-static
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install --delete-original \
--vendor=fedora \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT/%{_datadir}/applications/*.desktop
%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
%post
update-desktop-database &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%postun
update-desktop-database &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%files -f %{name}.lang
%defattr(-,root,root)
%{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.glade
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/applications/*.desktop
%{_bindir}/*
%{_sysconfdir}/NetworkManager/VPN/*.name
%{_sysconfdir}/dbus-1/system.d/*.conf
%{_libdir}/*.so*
%{_libdir}/pppd/%{ppp_version}/*.so
%exclude %{_libdir}/*.la
%{_libexecdir}/*
%doc AUTHORS ChangeLog README TODO
%changelog
* Mon Apr 21 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.6.4-2
- Take Dan Horak's review into account (#443807):
- Do not install versioned .so-s for properties module
- Do not do useless ldconfigs
- Remove leftover dependencies
* Mon Apr 21 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.6.4-1
- Branch this for EPEL, go back to:
- 0.6.4
- NetworkManager-pptp from NetworkManager-ppp_vpn
- Install pppd plugin correctly
* Wed Nov 21 2007 Lubomir Kundrak <lkundrak at redhat.com> 0.7.0-0.3.svn3549
- Update against trunk
* Wed Nov 21 2007 Lubomir Kundrak <lkundrak at redhat.com> 0.7.0-0.2.svn3085
- Do not exclude .so for NM, and properly generate the .name file
* Thu Nov 15 2007 Lubomir Kundrak <lkundrak at redhat.com> 0.7.0-0.1.svn3085
- Initial packaging attempt, inspired by NetworkManager-openvpn
- Nearly completly rewritten spec, all bugs in it are solely my responsibility
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 25 Apr 2008 15:14:31 -0000 1.1
+++ .cvsignore 25 Apr 2008 15:35:51 -0000 1.2
@@ -0,0 +1 @@
+NetworkManager-pptp-0.6.4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-pptp/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 25 Apr 2008 15:14:31 -0000 1.1
+++ sources 25 Apr 2008 15:35:51 -0000 1.2
@@ -0,0 +1 @@
+fb3cbdb32cf67a434229e6e1d1dd9616 NetworkManager-pptp-0.6.4.tar.gz
More information about the fedora-extras-commits
mailing list